Merge "Remove TZUvA references." am: 02d87d0471 am: 983ab7293e am: 09ef87c0b3

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

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