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

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



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