Merge "[automerger skipped] Merge "Added HIDL based software implementation of gatekeeper" into qt-r1-dev-plus-aosp am: 3459d57e11 -s ours am skip reason: change_id I632aeb6677640c133ec1b79e72568840adbc0550 with SHA1 f9f366e519 is in history"