Merge "Fix track-assignment omission" into udc-dev am: af7d8d4b

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



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