[automerger skipped] Merge "Move handheld-specific controllers out of base...

[automerger skipped] Merge "Move handheld-specific controllers out of base module" into sc-v2-dev am: 6ae7c7b2 am: c1ca143b -s ours

am skip reason: Merged-In If56b18e5814d1fa3d66f5ff04fa84ac6dd54f453 with SHA-1 71b45a05 is already in history

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

Change-Id: Ida876408d6c62f48b12b4ed4cf2aba7fd9e2853c