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

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

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



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