Merge "Use alternative prox sensor when specified." into rvc-dev am: 9cfce017d7 am: d00ed73db6 am: f81df4126d
Change-Id: Iee289e7d9d767313c1622e90815f75e06bdb3b83
This commit is contained in: