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

Change-Id: I309e654e65001d9b97c457a272601761e54f9a73