[automerger skipped] Merge changes from topic "privacy-type-media-projection" into tm-dev am: d59d17d74a am: e9bb088522 -s ours am: 2e3a324fcf -s ours am: b25a9c1ab5 -s ours

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

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

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