[automerger skipped] Merge "Only load default lightsensor for Brightness...

[automerger skipped] Merge "Only load default lightsensor for Brightness Tracker" into tm-qpr-dev am: 10cd7d59 am: 10a05c05 -s ours

am skip reason: Merged-In If0397af675caed0568bed06d82f7d925002c8df8 with SHA-1 074e1570 is already in history

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



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