[automerger skipped] Merge "Add null check for default proximity sensor." into rvc-d1-dev am: a994e405 -s ours am: 2da83c85 -s ours
am skip reason: Change-Id I474628d7ba32a9178fd720563fe2eca177920203 with SHA-1 4ef50ab6 is in history
Change-Id: Ia46152032d9588968385f39f1a07759619ede575