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: 7bf628ff am: 66baecb0

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

Change-Id: I439ebf62179bd6b8f5d79db22e7c8f5d9f34ee4a