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

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



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