Merge changes from topics "gpuMem", "timeInState" am: db8f9c58d4 am: e38da31442

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2149414

Change-Id: Ica8379cb192c73ff94721c53d4f2666a562499c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>