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

Merge "[RESTRICT AUTOMERGE] Correct the behavior of ACTION_PACKAGE_DATA_CLEARED" into qt-dev am: efd2f4cd

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



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