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

Change-Id: I69e471df7a9f5eb061d44b51981dfb91a2d0a8bb