[automerger skipped] Merge "Update owners" am: bdb94bb5 am: f8316c9e am: 0ae815de -s ours

am skip reason: skipped by user corinac

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



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