[automerger skipped] Merge "Fix broken test on GSI branch" am: 0fe46d947a -s ours am: 430ef242c4 -s ours am: efa70ccb43 -s ours am: 0b3fa2a944 -s ours am: 61cdc7f9a8 -s ours

am skip reason: Merged-In Ibdd72ec062538838ad60b847ee1ff31a792520a3 with SHA-1 ecafad4383 is already in history

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

Change-Id: I4d2ab33133bfb3ea5d773736fe202a6ab8bc13c8