Merge "Remove the owner" am: 286344d5 am: 448c8b61 am: 61ef9024 am: 7f29649a

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



Change-Id: Ie4d1c3582b63c446f145c008d390d3b0f37a8584
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>