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

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

Change-Id: Ib88b304ac10c50c84dd278a31a13b6961bb28bb7