Remove ATAP code am: 5035f40ea1 am: 5cd693cc1c

Original change: https://android-review.googlesource.com/c/trusty/app/keymaster/+/2849939

Change-Id: Ic9f6969b67d5c758ab77d97f3d69467b0fc22b1e
Signed-off-by: Automerger Merge Worker <[email protected]>