Merge changes from topics "gpuMem", "timeInState" am: db8f9c58 am:...

Merge changes from topics "gpuMem", "timeInState" am: db8f9c58 am: e38da314 am: 8074308b am: da5299f1

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



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