Merge "msmnile_au: Enable audiocontrol service for Android U"