Merge "Support blink scan" am: 1d4bf166d4 am: c067dc9979

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieb3e92354bb34dc4503e69628e338dd0e61ea152