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

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



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