Merge changes from topics "WPT_279560135", "WPT_DPM_ROLE_HOLDER" into udc-dev am: a1f45f65 am: cab2b8de

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



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