Merge changes from topic "privacy-type-media-projection" into tm-dev am:...

Merge changes from topic "privacy-type-media-projection" into tm-dev am: d59d17d7 am: b8dbb517 am: af3680c6

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



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