[automerger skipped] Merge "[DO NOT MERGE] Temporarily remove...

[automerger skipped] Merge "[DO NOT MERGE] Temporarily remove BackupRestoreEventLogger test from presubmit" into udc-dev am: 84477b7c am: 743b7080 am: 5c20fcc8 am: 89d2ecc1 -s ours

am skip reason: subject contains skip directive

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



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