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

Merge "Merge "Remove unnecessary line" into udc-dev am: 591e6d52 am: 088d5eb8" into udc-d1-dev-plus-aosp am: 8d19f8bb

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



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