[automerger skipped] Merge "Added HIDL based software implementation of gatekeeper" am: 7350a531
am: bcb3caa4 -s ours
am skip reason: change_id I632aeb6677640c133ec1b79e72568840adbc0550 with SHA1 b1d2df1e is in history
Change-Id: Ia6ff8e9a9386344eb607eeb2ba96021c6d6e8dd9