[automerger skipped] Merge "Fixed failing testAdoptAllShellPermissions test" am: 9f579e1f96 am: a9fd16f4b3 am: 49803915b9 -s ours

am skip reason: skip tag Change-Id I2c4af8cc5078f3f76b34dd20a993582e5fa0eeeb with SHA-1 2dd7f3e138 is already in history

Original change: https://android-review.googlesource.com/c/platform/cts/+/1678128

Change-Id: Ib532bbbc180403d41e787a60248042a9d6f42d11