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

Change-Id: I5d1908e22212f9d434cd9c29028710d09c4428d8