[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: 3fa92d8231 -s ours am: 4e1332872c -s ours am: caa93a0e72 -s ours am: 5392c8b00a -s ours

am skip reason: Merged-In I3d37fee446655b59b6b4837aaf9f8073d49d78db with SHA-1 e9be183035 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libbackup/+/19091805

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