[automerger skipped] DO NOT MERGE: Persist UWB State in AOSP stack. am:...

[automerger skipped] DO NOT MERGE: Persist UWB State in AOSP stack. am: f63aa887 am: 59904b95 -s ours am: 3b8193af -s ours

am skip reason: subject contains skip directive

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

Change-Id: I38a62403387400a21239bdd9dac2bf434afc3191