Merge "Add missing required extension" into udc-dev am: ba26bf97 am: c0288475 am: e859b385

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



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