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: I31d71aec7c28580f154329d5f3693dd8887478ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>