Merge changes from topic "fixTDM" into udc-dev am: 071cdcea07

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/graphics/zuma/+/21577305

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