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

Change-Id: I2c99b58b9f7369dd5b07a6d7ef74102c55a7031a