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

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



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