[automerger skipped] Merge "Support blink scan" am: 1d4bf166 am: c067dc99...

[automerger skipped] Merge "Support blink scan" am: 1d4bf166 am: c067dc99 am: 0a9f4b4f -s ours

am skip reason: Change-Id Iec5ba453b3d3d40c0d96fda5c7288b79898d9aea with SHA-1 e18379f5 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I90c0612d1eb5b92a3a2c5642356c27df4c334c3a