[automerger skipped] Merge "DO NOT MERGE: Clear calling context when adding UWB default setting." into sc-qpr1-dev am: a1fb4fce8d -s ours

am skip reason: subject contains skip directive

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

Change-Id: I05871183d6c54dd7e8163dd0508a049c74611f15