Merge "add ownership" am: c63817d8f0

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iee5e276a3a67b8ce25490246628878f09dee9b11