Merge "Expanding owners for /pm/" am: 43023f5f am: 199e2ed6

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



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