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

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Correct the behavior of ACTION_PACKAGE_DATA_CLEARED" into tm-dev am: 55c6e878 am: 232b1ec9 -s ours

am skip reason: subject contains skip directive

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



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