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 am: f0ecf929

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



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