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

[automerger skipped] Merge "DO NOT MERGE: Persist UWB State in AOSP stack." into sc-qpr1-dev am: ba5c9e07 -s ours am: 41ca2079 -s ours am: 06e786bd -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ic6afa94f3830a78ecb42446464f35a2e3db3b268