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

Merge "Add missing required extension" into udc-dev am: ba26bf97 am: 07a38dae am: 26fffbd8 am: 4ef2294e

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



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