[automerger skipped] Merge "Making the config_screenThresholdLevels a float array to fix the issue where it was always greater than all possible brightness values" am: fdc5610e4b -s ours am: ce60b5cd74 -s ours
am skip reason: Merged-In I177d7a1aa48bdfb3385780f0eee7af689755efb4 with SHA-1 8d81aca23a is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2259541
Change-Id: I4fd3e998083b6a73556355faa5ea4729f1f26240
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: