Merge "fixup! Show event log when application data is deleted" into main am: 253698da

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



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