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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia9decdca40272066e107fbc095dfeb2bb546c9a7