[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 am: 5d3b48ad -s ours am: 3c1dbfb8 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I60f2658ae44129a83262e5cf85b217159b616ded