[automerger skipped] Merge "Avoid deprecated PrivateKeyInfo.getAlgorithmId()" am: a934366a8d am: 8caeafdf92
am: eae7538909  -s ours

Change-Id: Ibebf9810795cc9b87bcfdcc123d9f8b360260986