[automerger skipped] Merge changes from topic "privacy-type-media-projection"...

[automerger skipped] Merge changes from topic "privacy-type-media-projection" into tm-dev am: d59d17d7 am: b8dbb517 am: af3680c6 am: 0a3fef0a -s ours

am skip reason: Merged-In I8924ebb7871da432b0e4e49c465a0c43e515ca4b with SHA-1 a7b00c57 is already in history

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



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