Merge "Extract separate INTENT_OWNERS" am: 122b69806b am: 58d515dc0c

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

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