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

Change-Id: Id2fd642d95ac548f02122ccbb6cda013438457d7