[automerger skipped] Merge "[RESTRICT AUTOMERGE]Prevent set intent on non-leaf tasks" into rvc-dev am: bf06070af0 am: ba83a11456 -s ours am: 055db8bd4e -s ours am: 66435f9f25 -s ours

am skip reason: subject contains skip directive

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

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