Merge "Address API feedback for BackupRestoreEventLogger" into udc-dev am: 3eb0a875 am: 498a9634

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



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