Merge "Finalizing V2 Bugs - Removing TODOs" into udc-dev am: 761cab9a

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



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