Bug: 135177365 Test: runs like before using - atest FrameworksUtilTests Change-Id: I61f827c65590d7fdabd94e56096c88d9d7e79b5d
a1cae83560
05b194e058
c26cc3d35a