Merge "Add persistent state for Bluetooth high quality audio support" into oc-dev
am: d53a71f443

Change-Id: I735640f2c9c7a00ab206372ffa33f51621546e78