[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: 3afb3ac806 -s ours

am skip reason: subject contains skip directive

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

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