Merge "AOD: Keep brightness sensor registered while covered" into oc-mr1-dev am: 10070c6356
am: cd625c696a

Change-Id: If62deed10330e05610dd6b2c5d868c8e0ce5b72e