Merge "Add maxTargetSdk restriction to unused APIs." am: 732a38c515

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

Change-Id: I046567830e35268cd14f657185bfe1cf889ad75f