[automerger skipped] Merge "[RESTRICT AUTOMERGE]Prevent set intent on non-leaf...

[automerger skipped] Merge "[RESTRICT AUTOMERGE]Prevent set intent on non-leaf tasks" into rvc-dev am: bf06070a am: ba83a114 -s ours

am skip reason: subject contains skip directive

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



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