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

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

Change-Id: Ife1bcb70febb986e465689224dedc47d5025a5b2