Merge "Fix 5153611 remove remote control client/display log from AudioService" into ics-mr0