[automerger skipped] DO NOT MERGE: Persist UWB State in AOSP stack. am: f63aa88736 am: 59904b95ac -s ours

am skip reason: subject contains skip directive

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

Change-Id: I5926a549e085e015e64416c0c81e2488acc3c48a