Merge "Fix test relying on implementation details." am: 8410e0ea am:...

Merge "Fix test relying on implementation details." am: 8410e0ea am: 512e2acd am: 85cc5ab8 am: befe914c

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



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