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

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

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



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