Merge "add ownership" am: c63817d8f0 am: b327283c1d

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I843daa05b152bc2fdd2b51f6e7038df98a54e3d6