Merge "Owners updates" am: 59465ee9d3 am: 2b1b458f1a

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I308590ad0678932d17660264de8f7a81918bd371