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

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

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