Merge "C++ AIDL on-device GateKeeper / SharedSecret impl" into main