Merge "Add owner for wm policy test" am: 4ccfb8ecff am: f6f1a8d7cf

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

Change-Id: Id2aa7af38dd479e23956abaef6b9c814a6e9c9b5