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