Merge "Track the media projection FGS types per UID" into udc-dev am: be6ef6dc am: a6a9c7cb

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



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