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 am: c2c9ba43

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



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