[automerger skipped] Merge Android R am: a57116554e -s ours

am skip reason: Change-Id Ie7cb70566695de61c3605b1b279dff6b65275601 with SHA-1 7088c5a113 is in history

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

Change-Id: Ib2a7949b672873b706d7c8963103005336660f12