[automerger skipped] Merge "Replace gatekeeper with software HIDL service." am: ca3260de9e
am: bb2a08ae39 -s ours
am skip reason: change_id I1e18491a9f812e0e35d9d00f603b8a313371efde with SHA1 f9491e0edd is in history

Change-Id: I9b5af0fc20e3b798c7dd9803821976ff7cc733fc