Merge "Add ownership for ConfigurationController" am: c8677e4d05 am: 00a8690dc9

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If7bcd0a1ec24961df911e2b89d3a83969354e6ac