Merge "Don't touch auto dim on app change" into oc-mr1-dev
am: f7dc1a3290

Change-Id: I25ead35722e66e27361f47eca9ee440bc6b14494