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

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



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