[automerger skipped] Merge "Remove TZUvA feature." am: 10c7acc5 am:...

[automerger skipped] Merge "Remove TZUvA feature." am: 10c7acc5 am: 050cc503 am: cc4630cd am: cc5500c9 am: 9c308a61 -s ours

am skip reason: Merged-In I5f67e34e9beb608d3cf3c4c072b268805865f6dd with SHA-1 b9e72bab is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/953617



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