[automerger skipped] Merge "[DO NOT MERGE] Compatibilize UDC dev to master"...

[automerger skipped] Merge "[DO NOT MERGE] Compatibilize UDC dev to master" into udc-dev am: cc420d14 am: 12b91c61 -s ours

am skip reason: subject contains skip directive

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



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