Merge "Fix broken test on GSI branch" into stage-aosp-master am: 10284429b8 am: 4e1d55b395

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

Change-Id: I097bd62ada067f03217081a9127a0658430cdcf2