Merge "Merge "Track the media projection FGS types per UID" into udc-dev am: be6ef6dc am: 621f37fc am: cb9cacc3" into udc-qpr-dev-plus-aosp am: a787386b

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



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