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

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



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