Merge "dumpsys: OWNERS for test" am: 0eaac6dd5e am: ee421c69de

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1682217

Change-Id: Ibd2f2f670f0f145bc091827fb9e791adb0cbff21