[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: aab929d1 -s ours am: 90638d62 -s ours am: 52280479 -s ours

am skip reason: subject contains skip directive

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



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