Merge "Change Bluetooth stack code not to use the hidden API for Mainline"
am: bcc1d4eeea

Change-Id: I1d3194169321e59bcf0b352d5225f365e542ab37