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

Change-Id: I1dd3889756bcc6324f80d20aeecba95587e68f20