Merge "Move TEE rules to vendor image" into oc-dev am: fbccda3423
am: 4234d95f02

Change-Id: I5bf5e7a14936c275d78c1ae3438dcad88da33233