Merge "Detect `am get-current-user` failures" am: f033bb3736 am: 415b502381

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

Change-Id: I4ca1a95f4eb739bec7a9d46e02e313bd292cfa9d