[automerger skipped] Merge "Migrate display related methods to AIDL" into...

[automerger skipped] Merge "Migrate display related methods to AIDL" into tm-dev am: 922e1b9b am: 4e5672aa -s ours

am skip reason: Merged-In I11f011ce61bdd6dfbd8e0f1a1af8925820e3de58 with SHA-1 07e72366 is already in history

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



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