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