[automerger skipped] Merge "Replace broken --wait flag with...

[automerger skipped] Merge "Replace broken --wait flag with --wait-for-staged-ready flag" am: 5dba5ca4 am: 91dd1ab8 am: 62879c07 am: 78fd8be9 am: 8fda1a2c -s ours

am skip reason: Change-Id I8d2d0db56a00cfffc942963c3ee72464ea770c88 with SHA-1 42414a3a is in history

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

Change-Id: I1a5799dbac4a44d15f1bb9263b4551eb7114b080