[automerger skipped] Merge "Fix PinnerService SecurityException at boot" into rvc-dev am: bf2b4a3854 am: 19161547ad am: 70bb5631b5 -s ours am: 1c18e41bc1 -s ours
am skip reason: Change-Id I2cd845cb5fad3de251d110141dcd1af9ec3aa234 with SHA-1 37887b2d4c is in history
Change-Id: Ia534491e225a0e6d0f9b5997534f87146cefe8ec
This commit is contained in: