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

[automerger skipped] Merge "Only allow trusted overlays to specify FLAG_SLIPPERY" into sc-dev am: 94fb6eff am: dbb52635 am: c42bad07 am: e01a07c6 -s ours

am skip reason: Merged-In Ia30f1c38d5ddb351c90b748ea76448a76a9dde7b with SHA-1 0657e199 is already in history

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

Change-Id: I5cf778e53ce877912c404bc5974c5431e24edbe8