Merge "Merge "Fix location of side-fps indicator" into tm-dev am: 13ad3a2c am: 1a5d6ee3" into tm-d1-dev-plus-aosp am: 268c1295 am: d0a67e96

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



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