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

Merge "[RESTRICT AUTOMERGE] Correct the behavior of ACTION_PACKAGE_DATA_CLEARED" into tm-dev am: 55c6e878

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



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