[automerger skipped] Only allow trusted overlays to specify FLAG_SLIPPERY am:...

[automerger skipped] Only allow trusted overlays to specify FLAG_SLIPPERY am: 07e7aaff am: 6bdebc2a -s ours am: e1a2ccd0 -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/+/16190719

Change-Id: I37721fcdcf49633274882e53a1ae08b0980269a1