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

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

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



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