Merge "Fix "Backup deactivate failed" error" into rvc-dev am: 580fa5f256 am: 0a672efaeb am: de4d78f618 am: b241c62eed

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11900045

Change-Id: I5c770f1f04050bc4637ef773fbd560263171926f