Merge "AOD: selectively register sensors that use prox" into sc-dev