Merge "Add maxTargetSdk restriction to unused APIs." am: f8abe13db4

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1468245

Change-Id: I35f65987f7f9287cf03418e9feb27c81f4fd1878