Merge "Add missing Override annotation" into udc-dev am: 7e9609b4

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



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