Merge "Add additional APIs and aidl for ambient backlight feature" into main