Merge "Fix sidefps visibility." into tm-qpr-dev am: 804a8e11 am: 9236bc13...

Merge "Fix sidefps visibility." into tm-qpr-dev am: 804a8e11 am: 9236bc13 am: 8a399a28 am: eda5deb9

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



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