Merge "Make setBrightnessConfigurationForUser locked" into sc-v2-dev am: c19c6d4b3c am: 5c782095fd

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

Change-Id: I589444fcfc0ca644d2054fa125d49c6b21c811dc