Merge "Owners updates" am: 59465ee9d3

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1531440

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2de2ba79486a4ec7df4962ca22ea21162c9f7ba3