Merge "Merge "Store brightnessThrottlingDataId in DisplayInfo" into udc-dev am: 07828885 am: 4dcdef8b" into udc-d1-dev-plus-aosp am: ce5ab416

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



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