Merge "Owners updates" am: 395caa5fa6 am: c309ada683 am: 9aa1396e61

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia171da64408594c083538b047ee509dfe7d8fb20