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

Change-Id: I06ab7d05813ff4ca0d769e147616e80a8aa74c66