Merge changes from topic "multiDisplayPowerProfile" into sc-v2-dev am: 71f8cf24e2 am: d3b973ce7e

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

Change-Id: I9916d9b3ed9ed839f45a228a01ec9d4477e7eb16