[automerger skipped] Merge "IMS: Refactor additional display input properties...

[automerger skipped] Merge "IMS: Refactor additional display input properties to avoid deadlock" into tm-dev am: 3c232f03 am: 6c4abcc9 -s ours

am skip reason: Merged-In I9b95814903b7a4a646d6b4e4910c9e88dd2e0174 with SHA-1 95d48680 is already in history

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



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