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

[automerger skipped] Merge "Migrate display related methods to AIDL part 3" into tm-dev am: f15a14d1 am: 5958eb13 -s ours

am skip reason: Merged-In Iacdc42dde1608f883c5578aa3d9f9f8ae9f23038 with SHA-1 aa7fc2e4 is already in history

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



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