Merge changes from topic "comm_device_hardening_udc_qpr" into udc-qpr-dev am: 4321cd2b

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



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