Merge "Fixed failing testAdoptAllShellPermissions test" am: 9f579e1f96 am: a9fd16f4b3

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

Change-Id: I92425c983c18b6a3aa096cd4ce17fd7bbdde6a1d