[automerger skipped] fix soft reboot caused by KeyStore exception am: ca754506fa -s ours
am skip reason: Change-Id I8a3b810ba95898a96d81fe57979db4787e1a46c4 with SHA-1 975bc2676f is in history

Change-Id: Ia71ba06d0993473e9d90c7b19f3842e030fa5d09
tree: 0d3fe84aa36c694b079700a183289e134998df30
  1. service/
  2. PREUPLOAD.cfg