[automerger skipped] Merge changes from topic "comm_device_hardening_udc_qpr"...

[automerger skipped] Merge changes from topic "comm_device_hardening_udc_qpr" into udc-qpr-dev am: 4321cd2b am: 92f7d4ac -s ours

am skip reason: Merged-In Ie6b8514fe61d3efce6c65af5bc8e5fa2562db4ca with SHA-1 df5f3fb6 is already in history

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



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