Merge "Merge "Remove unnecessary line" into udc-dev am: 591e6d52 am:...

Merge "Merge "Remove unnecessary line" into udc-dev am: 591e6d52 am: 8605a1bd" into udc-d1-dev-plus-aosp am: d8c8ad1d

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



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