Merge "Update keyguard mic icon to rounded" into oc-dr1-dev am: ea0beea5dd
am: ca07589a0a

Change-Id: I693532da82e2edba31069be1dd4ad257dec2c389