Merge "Fix side stage cannot be focused" into sc-v2-dev am: 28643db5fe am: 4208679ccf

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

Change-Id: I4e857790e17e264ac3717eaf362ca40bcc5df787