Merge "Reset display input properties when removed" into tm-dev am: d0601bbc

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



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