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

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Correct the behavior of ACTION_PACKAGE_DATA_CLEARED" into rvc-dev am: 132dc2f9 am: 377ac368 -s ours am: 08b5b89a -s ours

am skip reason: subject contains skip directive

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



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