[automerger skipped] Merge "RESTRICT AUTOMERGE Use Alternative Prox Sensor for Falsing" into qt-qpr1-dev am: 8161bd3ab6 am: 7e6457334f -s ours
am skip reason: subject contains skip directive

Change-Id: Ibba07335e72ce19c0dd1631c24630a59b4dc08ce