[automerger skipped] Merge "Raise tz standards for uninitialized devices" into...
[automerger skipped] Merge "Raise tz standards for uninitialized devices" into rvc-dev am: 21ce7ddb -s ours am: a5b00910 -s ours
am skip reason: Change-Id I1dbd1046f0e641e609ecc8809cf86b7ddb6111b3 with SHA-1 ea6b34da is in history
Change-Id: I144911d4a124cd2aef50585953eac183090f2908