Merge "Gatekeeper generated aidl cpp bindings" into qt-r1-dev-plus-aosp