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

[automerger skipped] Merge "Migrate display related methods to AIDL part 2" into tm-dev am: f0e58ecc am: 311d687a -s ours

am skip reason: Merged-In I57f428f6934e784cb234704ad89ef22218e441b4 with SHA-1 37396db2 is already in history

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



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