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

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



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