[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: 0ddc37f6 am: 8ee3c73f -s ours

am skip reason: Merged-In I57f428f6934e784cb234704ad89ef22218e441b4 with SHA-1 694aeffb is already in history

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



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