Bug: 129485781 Test: Build Change-Id: I90fc0868df85887e542372cd55dc76be14c9d420
Bug: 111098596 Test: vts, atrace and systrace (cherry picked from commit db895ad8da) Change-Id: Iea4ee4bff7509031a6daaf7c9570d0583a59affa
db895ad8da