Merge "Fix sidefps not visible after home-control longpress" into tm-qpr-dev am: f1840aed

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



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