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 am: bd349dd1

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

Change-Id: I4fb1648f6465ddd11ae4605ab11a0482614a045d