Merge "Add aconfig-annotations-lib as build time dependency" into main am:...

Merge "Add aconfig-annotations-lib as build time dependency" into main am: 754c0abf am: b7d37f2f

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2734913



Change-Id: I8da07e86cc0f4fc487c42ada842d78a6f22ce57f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>