[automerger skipped] Merge Android R am: a57116554e -s ours am: a33524fe17 -s ours am: e3c6e55b37 -s ours am: 108cb5e0ed -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: I32a77fa7057209a3170c398f06b1c57beda03c49