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

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

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