Merge "Bluetooth 5 feature check implementation (2/3)" am: 69606698b2
am: 3aa949fad0

Change-Id: I54c2bc9c544fdea56e1d3653adb54325ede97e43