[automerger skipped] Merge "Add compat annotation processor for services/core." am: b1597060fc am: 65886069ed -s ours am: a930f66663 -s ours
am skip reason: Change-Id I25c6339c6adeb907878596332f57e2fa229bfda9 with SHA-1 60c39b3bc8 is in history
Change-Id: Ib4465e8d9c932c4135dd44036f1163695d1f0c33
This commit is contained in: