Merge "Resolve BluetoothHearingAid API usages by Settings" am: a83641557b am: 1099497d45

Change-Id: I4708867d2e125bfa1adc27cf18817a5e7d90046d