Merge "Do not clear HUNs when device wakes up" into udc-dev am: 795d7845 am:...

Merge "Do not clear HUNs when device wakes up" into udc-dev am: 795d7845 am: 4b95a935 am: d61f34a1

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



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