Merge "Replace broken --wait flag with --wait-for-staged-ready flag" am:...

Merge "Replace broken --wait flag with --wait-for-staged-ready flag" am: 5dba5ca4 am: 91dd1ab8 am: 62879c07 am: 78fd8be9

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433436

Change-Id: I5c5e16d615e480c73bd82a1e539073fd3d05a4d9