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

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

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