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

Change-Id: I56c2eb9a3dca6e8dad1cbddeabe4ebbe471b4758