[automerger skipped] Check if advertiserId value matches valid advertiser am: 90107b7651 -s ours am: 0da6fbbaff -s ours am: 487b1f8654 -s ours

am skip reason: Change-Id I4536abc50e15cfc72489e01f8907face967df263 with SHA-1 389f39b3d3 is in history

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

Change-Id: Ie49e4678ab98dd5f4ef1611f9dc28060d72628f6