Merge "Merge "Move two audio APIs back the the greylist." into qt-dev am:...
Merge "Merge "Move two audio APIs back the the greylist." into qt-dev am: 811c8a06 am: d255776d" into qt-r1-dev-plus-aosp
am: 916bbc6f
Change-Id: Ida7c5e5c241e358811e1a7e91ebe0d8e629d9aad