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

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

Change-Id: Id404fc7aa4bcd32fe49363fad074953997fb66a9