Merge "Use framework-annotations-lib" am: d6d4011f58 am: 6d5a597fb7

Original change: https://android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/1657981

Change-Id: I7b67c8aa8ab08efe37703ba6ef4b78da96a8b048