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

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

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



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