[automerger skipped] Merge "Allow No Sensor to be Specified in DDC" into...

[automerger skipped] Merge "Allow No Sensor to be Specified in DDC" into tm-qpr-dev am: 55d73f2e am: 1e27edce -s ours

am skip reason: Merged-In I8508a191b7c7c5990929e4d020ffd144c7faeef7 with SHA-1 a608da9d is already in history

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



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