[automerger skipped] Detect non-A/B vs. A/B packages correctly. am: f2af5629...
[automerger skipped] Detect non-A/B vs. A/B packages correctly. am: f2af5629 am: d5c56cee -s ours
am skip reason: Change-Id I629a533a67966d46d9cd87a59c6b9af26daf1667 with SHA-1 2a4afd29 is in history
Change-Id: Ifa8914b5d2568de6f2da218ec3708a7390d7e5ef