Merge "Add ApkInfo.proto to 'aapt2-protos' artifact that was missed initially." into main