Merge "Bluetooth 5 enhanced scanning API"
am: bed6fb3f5a

Change-Id: I27d61ec7446c36143dcd5a94158451e1be9a5411