Merge "Merge "Fix state deletion for transient backup issues." into rvc-qpr-dev am: 2170ba0f" into rvc-qpr-dev-plus-aosp am: 7efe8636

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

Change-Id: Iee6448a29609a1c147075b36c1446842f77930c8