[automerger skipped] Merge "Add compat annotation processor for...

[automerger skipped] Merge "Add compat annotation processor for services/core." am: b1597060 am: 65886069 -s ours am: a930f666 -s ours am: d32a034f -s ours
am skip reason: Change-Id I25c6339c6adeb907878596332f57e2fa229bfda9 with SHA-1 60c39b3b is in history

Change-Id: I2580d573c31b1f592bea33f77a90fd7fcd41bdbf