[automerger skipped] Merge history of framework-annotations am: 3a185fd909 -s ours am: 40d34f3f6b -s ours

am skip reason: Merged-In I24a753a25583e50d8ca8cf7d2a4f2d0567db6dd2 with SHA-1 35158c4f10 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/libs/modules-utils/+/14400987

Change-Id: Ibc83b56ccbc177a4ca6bd9892711eefbf112815f
tree: f60dd98d4e55be12825804d2af1a7fa134f2dc87
  1. build/
  2. java/
  3. javatests/
  4. tools/
  5. Android.bp
  6. OWNERS
  7. PREUPLOAD.cfg
  8. TEST_MAPPING