[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: 81fcf4a2 am: e6fb6939 -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: Ide6db1b3dc5d26ff9898e63866681731c8ae0f23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>