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

Change-Id: Id42b9431c97bebd3fb308a455db6d07df66c19bd