[automerger skipped] DO NOT MERGE: Clear calling context when adding UWB...

[automerger skipped] DO NOT MERGE: Clear calling context when adding UWB default setting. am: fae54522 am: 0f1edd32 -s ours am: 01a57c33 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I8c5f3e3a57dc9b59e38d2671659f4c2a40a19b30