[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: 73bd83cc -s ours

am skip reason: Merged-In I4b8ca7f52079260eb9bf4cc8c69d88713087d6ac with SHA-1 781ccd4b is already in history

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



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