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

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

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



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