Merge "Make default brightness ramp rates multiples of 60." into oc-mr1-dev am: 9010bfb05e
am: 23c0298b45

Change-Id: Ib9d928ac31fa1738c9159496660f7f33d4d9b0b6