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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idd9deec4fbed0cc64f9803ba6142f602b7597f8c