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

Change-Id: I89243d3e5e687458b4177572de0fc9a6ebafeb1c