Merge "Merge "Do not re-pin unpinned HUNs" into udc-dev am: a338728c am:...

Merge "Merge "Do not re-pin unpinned HUNs" into udc-dev am: a338728c am: 35375ddd am: 28d5ae51" into udc-qpr-dev-plus-aosp am: 9eeb8527

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



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