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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaee9b8efb8bc9a54d0979169cca03bfb218a61cd