[automerger skipped] Merge "Add app op for Bluetooth scans" into pi-dev am: 6fb01a8a56
am: 8966f68c30  -s ours

Change-Id: I1c289cc0698703ee3260fe993d7c5367faae2f6b