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

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Correct the behavior of ACTION_PACKAGE_DATA_CLEARED" into qt-dev am: efd2f4cd am: 9e9dcb3d -s ours

am skip reason: subject contains skip directive

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



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