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

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

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