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

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



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