Merge "Moving autobrightness display configs to a different file" into...

Merge "Moving autobrightness display configs to a different file" into tm-qpr-dev am: b90801bb am: 87340702

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



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