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: aa0b35d7

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



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