Merge "Fix SideFps indicator being covered" into udc-dev am: 812f46d8 am: 97dbb8d1 am: 8ddf8230

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



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