Merge "Fix PolicyListener testing surface." am: c5bc3bcd8f am: 3b1c79bdc9

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I60347b063c5102b0abf9e1464c0f9b7438bcf347