Merge "Add missing required extension" into udc-dev am: ba26bf97 am: 07a38dae am: 8b6e5dac

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



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