Merge "add ownership" am: c63817d8f0 am: b327283c1d am: c352f6cded

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3aab719f7d71fb4a16400f4b89cbd0a705ac31c8