[automerger skipped] Merge "Remove MODIFY_TOUCH_MODE_STATE from SystemApi"...

[automerger skipped] Merge "Remove MODIFY_TOUCH_MODE_STATE from SystemApi" into tm-dev am: 286aed55 am: 058ac1b7 -s ours

am skip reason: Merged-In Id28a997a682207a67714fabc498639c24428477e with SHA-1 5e763e85 is already in history

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

Change-Id: I6936c1669db031e18d39ffda5ba300043a8d5023