[automerger skipped] [DO NOT MERGE] Compatibilize UDC dev to master am:...

[automerger skipped] [DO NOT MERGE] Compatibilize UDC dev to master am: 3a989797 am: 86c60c3c -s ours

am skip reason: subject contains skip directive

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



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