Merge "Fix location of side-fps indicator" into tm-dev am: 13ad3a2c

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



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