Merge "Ensure sensor id is set before face detect." into udc-dev am: 786c9f52 am: cf13fefc

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21688405



Change-Id: I3756b2d687a4b840f2532d1cdf248d5e116fcbab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>