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

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



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