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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ief6ec93c745795c2fa96c50560e916196f68d3d5