Merge "AVRCP Controller State without Browsing"
am: b08930eb8b

Change-Id: Ide930311ef2276e16627305aaea80dc342375eeb