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

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



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