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

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

Change-Id: I2ecc6d14a99c9099d4dd76936d3d3c086b8784fd