Merge "Fix track-assignment omission" into udc-dev am: af7d8d4b am: 89dfbb24 am: 7a198b74

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



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