Merge "Le Scan: Add ambient discovery mode (1/2)" am: 4a47532570 am: c1b4ca0ef5

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

Change-Id: I2dd373dc17b677d5d707d8112d69a04dd50ae101