[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: 05179c6b am: 84b7401e -s ours

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

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



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