[automerger skipped] Only allow trusted overlays to specify FLAG_SLIPPERY am: 07e7aaff29 am: 6bdebc2a7d -s ours am: e1a2ccd0e5 -s ours am: db96b08d15 -s ours am: a0a4b2a294 -s ours

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

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

Change-Id: I67abf000e7d6851f4fc879c99e12c74ea58ae7d3