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

am skip reason: subject contains skip directive

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

Change-Id: I991ece8496f09f2448e073ce52b980bb35d62713