Merge "Merge "Move two audio APIs back the the greylist." into qt-dev am: 811c8a06e0 am: d255776d9d" into qt-r1-dev-plus-aosp