Merge "Fix test relying on implementation details." am: 8410e0ea92 am: 512e2acdfd am: 85cc5ab8b8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2481489 Change-Id: I5b846935a057ac22e55b1429090f87583ffe499c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: