[automerger skipped] Merge "[RESTRICT AUTOMERGE] Correct the behavior of...

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Correct the behavior of ACTION_PACKAGE_DATA_CLEARED" into sc-v2-dev am: a74b09c2 -s ours am: b0680b8b -s ours am: bea1b21d -s ours

am skip reason: subject contains skip directive

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



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