Merge "Ensure WAIT packet upon HELO in --suspend mode" am: 5e947c04e5 am: aea0bb4dc1 am: 6b86a653bf

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

Change-Id: I5953a70ac4e20e86ae62de54f7ad8e681431c74a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>