Merge "IMS: Refactor additional display input properties to avoid deadlock"...

Merge "IMS: Refactor additional display input properties to avoid deadlock" into tm-dev am: 3c232f03 am: e4037223 am: 02d2e0cf

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



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