[automerger skipped] Merge "Added HIDL based software implementation of gatekeeper" am: 7350a53137 am: bcb3caa4ae -s ours am: c329ea5d18 -s ours
am: d6c3bbd2af -s ours
am skip reason: change_id I632aeb6677640c133ec1b79e72568840adbc0550 with SHA1 b1d2df1ed0 is in history

Change-Id: Ief2aa60d5d4f87af21ec5d57b13f61c4cda70826