Merge "Remove NativeInputManager::isPerDisplayTouchModeEnabled" into udc-dev am: 921d0185 am: e051a7b2

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



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