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

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

Change-Id: Id3f4b2091412a64574bd918c68754d08bd12b6f8