Merge "Further V2 Modifications, Prep for V3" into udc-dev am: 2be846db

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



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