[automerger skipped] Merge "Add null check for default proximity sensor." into rvc-d1-dev am: a994e405 am: 58654ea7 -s ours
am skip reason: Change-Id I474628d7ba32a9178fd720563fe2eca177920203 with SHA-1 67a07c22 is in history
Change-Id: If21d8d8c88a1515905800dbac31c15d47f08e11f