[automerger skipped] [RESTRICT AUTOMERGE]Prevent set intent on non-leaf tasks am: c5aaf99d am: 9c198063 -s ours am: 20b65912 -s ours am: a00fcc85 -s ours am: 7f22339b -s ours am: 5f6405cd -s ours am: 004d473a -s ours

am skip reason: subject contains skip directive

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



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