[automerger skipped] Merge "Stem names are used in apkcerts.txt" am: 6b872d794b am: 8e679ce064 -s ours

am skip reason: Change-Id I56bc55e2231eb946617a9d6f97d55c9b61f3bff7 with SHA-1 f58fd52b14 is in history

Change-Id: I520c7ee5c00882d031b0673e1c905701ddec6db5