[automerger skipped] Merge "Fix broken test on GSI branch" am: 0fe46d94 -s...

[automerger skipped] Merge "Fix broken test on GSI branch" am: 0fe46d94 -s ours am: 430ef242 -s ours

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

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

Change-Id: Id2b0a40c57d9d7db822a1868a19f74e52b772bc3