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

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



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