Merge "Fixed failing testAdoptAllShellPermissions test" am: 9f579e1f96

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

Change-Id: I27f2d433a7978664a669e9f62ea219a3da5cedd1