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

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

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