Merge "Update touch mode regardless of mStopped" into tm-dev am: 88fdb7aa...

Merge "Update touch mode regardless of mStopped" into tm-dev am: 88fdb7aa am: b1b3b872 am: 9448e53b

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



Change-Id: Ic79d88b7e88f4da19cba86098ba35b2fa4640f0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>