Merge "Fixes updateOverlayVisibility and updates SideFpsControllerTest for natural orientation shift" into tm-qpr-dev am: 5bdad5d547 am: b865dc7437

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

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