Merge "Remove TZUvA references." am: 02d87d0471

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

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