Merge "[automerger skipped] Only allow trusted overlays to specify...

Merge "[automerger skipped] Only allow trusted overlays to specify FLAG_SLIPPERY am: 07e7aaff am: c7052c9c -s ours am: bb535c95 -s ours am: 734bde2b -s ours am: e8e382c0 -s ours" into sc-v2-dev-plus-aosp am: 105a34a7 -s ours

am skip reason: Merged-In Ia30f1c38d5ddb351c90b748ea76448a76a9dde7b with SHA-1 07e7aaff is already in history

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

Change-Id: Id9e667e35efbebef703c5a75e484320065fae84e