Merge "Clean-up after TZUvA feature removal." am: 06b9abf013 am: ac0cf4e9ae

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

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