Merge "DO NOT MERGE: Persist UWB State in AOSP stack." into sc-qpr1-dev