[automerger skipped] Cherry-pick some test changes from ag/13210542. am: 250710c687 am: 127c8b8336 am: b8a344c44c -s ours

am skip reason: skip tag Change-Id I35d28c8df341dbbac2774026c6ca749e296c0482 with SHA-1 21147c02f8 is already in history

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

Change-Id: I886ca8978862d2dacc11d2bd5d4977698e953935
This commit is contained in:
Lorenzo Colitti
2021-03-22 12:27:21 +00:00
committed by Automerger Merge Worker

Diff Content Not Available