[automerger skipped] Merge "Fix broken test" into tm-dev am: 372e99c655 am: 2eb8a752dc -s ours
am skip reason: Merged-In I42e0b3d0d02cb67822ea91f3b0e85f1b6192fa43 with SHA-1 93bce74ff0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17226767
Change-Id: Ibb996e1d86bcfa310608335ecc0de617e391ba7d
This commit is contained in: