Merge "Fix sidefps not visible after home-control longpress" into tm-qpr-dev...

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

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



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