Bug: 118811303 Test: runtest frameworks-net Change-Id: Id61a9efecf1d1ed5a9045b78ecfec9239e13967b
3f675c25e0