Bug: 62918393 Test: runtest frameworks-net Merged-In: I30f7eaa0307b8fad5a8de7a0da235a4f76c18677 (clean cherry-pick of I30f7eaa0307b8fad5a8de7a0da235a4f76c18677) Change-Id: I272fea0bb4a9e7f6252bb3bd14a6b769a082039e
Bug: 62918393 Test: runtest frameworks-net Merged-In: I30f7eaa0307b8fad5a8de7a0da235a4f76c18677 (clean cherry-pick of I30f7eaa0307b8fad5a8de7a0da235a4f76c18677) Change-Id: I272fea0bb4a9e7f6252bb3bd14a6b769a082039e