Merge "Fix AudioControl@2.0 fade check" into rvc-dev am: 331370012d am: 5fbf64e33a

Change-Id: Iffb75ff73fada413600250241948dc99c9d3d8b5