[automerger skipped] Merge "Fix input when hardware renderer drawing is...

[automerger skipped] Merge "Fix input when hardware renderer drawing is disabled." into tm-qpr-dev am: 0854d617 am: 74443ebd -s ours

am skip reason: Merged-In I4d6ca513c3daf5818ded03eae00e551fc319ad69 with SHA-1 32dfc983 is already in history

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



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