Merge "Fix one-handed mode tap app to exit doesn't work in factory boot" into...

Merge "Fix one-handed mode tap app to exit doesn't work in factory boot" into sc-dev am: 20c38783 am: b7edaae1

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

Change-Id: I6e9f55719a6122ecf9138eda80e23fbe32882325