Merge "Bluetooth 5 enhanced scanning API" am: bed6fb3f5a
am: 71760b71fd

Change-Id: I6a5de71a10fb1e326e57f3a9bd665229535a6571