Merge "Make the "stack" script work for device tests." am: ea6686f701 am: ff1bb6b5fe am: 895e424a4c

Original change: https://android-review.googlesource.com/c/platform/development/+/1606479

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I801204ee9493e06cea9e4bf5aa5d9a32c7dc76ba