Merge "Merge "Fix SideFps indicator being covered" into udc-dev am: 812f46d8...

Merge "Merge "Fix SideFps indicator being covered" into udc-dev am: 812f46d8 am: 97dbb8d1" into udc-d1-dev-plus-aosp am: 56f7fe8f

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23438716



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