Merge "Use alternative prox sensor when specified." into rvc-dev am: 9cfce017 am: 70f356b9 am: dc45c396 Change-Id: Ic3a200a506d3d4c5789118a2d4a1e012143aebb9