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

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

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