[automerger skipped] Merge "Migrate Screenshot methods to AIDL" into tm-dev...

[automerger skipped] Merge "Migrate Screenshot methods to AIDL" into tm-dev am: 4366188e am: 5ecbfe2a -s ours

am skip reason: Merged-In I66c874b79b793501e73f5bd3b1062cbda0318776 with SHA-1 0105156d is already in history

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

Change-Id: I3889b52878bec0e82f36f6485f92dd3facd52e6f