Merge "Fix test failure" into sc-v2-dev am: c26e08020c

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

Change-Id: Id18f4eb8dc064f14e3aec42b4d9f8712131c9d7e