Merge changes from topic "bt-a2dp-offload-aosp"
am: 262eb819c4

Change-Id: I008587282bdad3df2322f7975cf426ccb2e5ab91