Merge "Fix PinnerService SecurityException at boot" into rvc-dev am: bf2b4a38 am: 19161547 am: b401cc07 Change-Id: Ib60a24bee360b1f070c76072f9d05582ae3d1462