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

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

Change-Id: I1f13506427c74f83159b04ac472d52cbf6371e25