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

Change-Id: Iee0d80e8cecc173be272137f342ac7731df58371