Merge changes from topics "gpuMem", "timeInState" am: 43cfb1c6fb

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2149415

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