Bug: 32163131 Test: runtest frameworks-net Change-Id: Iea41c2b50502797f559afd09ded8cedf50dd7c05
f10fcafcdf