Merge "Merge "Extract separate INTENT_OWNERS" am: 122b6980 am: 58d515dc...

Merge "Merge "Extract separate INTENT_OWNERS" am: 122b6980 am: 58d515dc am: 7f527bb4" into udc-dev-plus-aosp am: 03cf0eb8 am: d2f265f9

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



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