[automerger skipped] Merge "[RESTRICT AUTOMERGE]Prevent set intent on non-leaf tasks" into rvc-dev am: bf06070a am: ba83a114 -s ours am: 055db8bd -s ours am: 3afb3ac8 -s ours am: 6443c9c1 -s ours am: ab9f2f21 -s ours am: dcc71ae1 -s ours am: babaddc1 -s ours

am skip reason: subject contains skip directive

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



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