[automerger skipped] Merge "Merge "Fix PinnerService SecurityException at...

[automerger skipped] Merge "Merge "Fix PinnerService SecurityException at boot" into rvc-dev am: bf2b4a38 am: 1dd7811c" into rvc-d1-dev-plus-aosp am: 599e4011 -s ours
am skip reason: Change-Id I2cd845cb5fad3de251d110141dcd1af9ec3aa234 with SHA-1 37887b2d is in history

Change-Id: I5776a12de0e0ff00e3e7946b73139fb4917fbf44