Merge "Get serial number after receiving attached intent" am: 2ba08dfa72

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

Change-Id: I5786b65da874332f72ec59b8b9af383f1ac1d5a4