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

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

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