[automerger skipped] Merge "Reset display input properties when removed" into...

[automerger skipped] Merge "Reset display input properties when removed" into tm-dev am: d0601bbc am: 768dd53e am: 2287e63f am: 17ea5356 -s ours

am skip reason: Merged-In I4b8ca7f52079260eb9bf4cc8c69d88713087d6ac with SHA-1 2d47a57d is already in history

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



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