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

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

Change-Id: Ia1c142195635b51b006a0773ab628291f03b2dc7