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

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

am skip reason: subject contains skip directive

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

Change-Id: Ibcce178d05a3a01428203c2fa11b9509fb7bec45