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

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

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



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