tree 8d97c2d6a8313dedff17d4a789aab898ae0010eb
parent 53c94b3f5285558801547915f93f59eb8777a5da
parent 2e83cb0c22d9d6832137e61ad1dc4029683b1577
author Robert Horvath <robhor@google.com> 1653936165 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1653936165 +0000

[automerger skipped] Merge changes from topic "privacy-type-media-projection" into tm-dev am: d59d17d74a am: e9bb088522 am: 2e83cb0c22 -s ours

am skip reason: Merged-In I8924ebb7871da432b0e4e49c465a0c43e515ca4b with SHA-1 a7b00c574e is already in history

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

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