Merge "Fix 5249234: Add contentDescription to buttons on transport control on lock screen."