Merge "Update brightness icon to rounded one" into oc-dr1-dev
am: 1948abac4a

Change-Id: I9ebd8fd915a1292682785e5742da8b98563b893e