Merge "Expanding owners for /pm/" am: 43023f5f04 am: 199e2ed6ba am: 419935579f

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

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