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

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

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