Merge "Use alternative prox sensor when specified." into rvc-dev am: 9cfce017 am: d00ed73d am: f81df412 Change-Id: Iee289e7d9d767313c1622e90815f75e06bdb3b83