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

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



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