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

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

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