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

Change-Id: I25406b379b0cb7d554505ad72912b45d01880f33