Merge "Keystore and gatekeeper not working when servicemanager crashed" am: c81d9b84c3
am: d32d93125c

Change-Id: Ic95a6b6729453be26629b3d46e2e3e04dae029c2