[automerger skipped] Merge "Gatekeeper generated aidl cpp bindings" into qt-dev-plus-aosp am: f7a4219a70 -s ours
am: 621ee1aa3f -s ours
am skip reason: change_id Ie3583f5682727b1f9a82d270764c94fce33388ec with SHA1 037a63fb02 is in history

Change-Id: I440038e84ab818c89ba2f7a3797fb6415bfbc959