[automerger skipped] Merge "Remove TZUvA references." am: 02d87d0471 am: 983ab7293e am: 09ef87c0b3 am: 35fcad7146 am: c5eea9356f -s ours

am skip reason: Merged-In Ibc4e55396b3ecd258b0c55ae65c3d923bba4c4bf with SHA-1 31f24e692c is already in history

Original change: https://android-review.googlesource.com/c/device/generic/uml/+/2117253

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