[automerger skipped] Merge "Updated SIG wording: whitelist to acceptlist" am: ffe209ad -s ours am: 95101632 -s ours am: a17f54ee -s ours am: 3da2390b -s ours am: f3e2bca1 -s ours

am skip reason: Change-Id I3828f40e1b1e44c575143f06389ab3fb1d3cb808 with SHA-1 60ddcc9a is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Bluetooth/+/1455142

Change-Id: Ib0555b53020549d62fd52b4b4d29253cb7ba3e3d