[automerger skipped] Merge "LightSensorController extraction from BrightnessClamperContorller" into main am: 129b7d26f3 am: af9fc42807 -s ours

am skip reason: Merged-In Icddf78defc8fdba83c4d210d12851c7d94adb8b1 with SHA-1 2726e78d86 is already in history

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

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