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

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

Change-Id: Ie3feaf684a5e1bb79d919cb346029ba57f2594b9