Merge "Bluetooth: Update grey list to match hidden API change" am: 97047fd725 am: 8dc0982b85
am: 9fca3d238d

Change-Id: I7ce3f536cc07049162272547b959b2637a985022