Merge "Le Scan: Add ambient discovery mode (2/2)" am: 6a86b6d738 am: 67635a1e13

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

Change-Id: I3746db56db9a88e69c04b886160412f1ee754f29