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: 09dc62ab

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

Change-Id: Ib53cf68e2362e11e0db87bd3d5787b4054c144b5