[automerger skipped] Merge "Add maxTargetSdk restriction to unused APIs." am: f8abe13d am: eb803166 am: 5a448e27 -s ours

am skip reason: Change-Id I626caf7c1fe46c5ab1f39c2895b42a34319f771a with SHA-1 5f0edaaa is in history

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

Change-Id: I121b7837c0d2a65bb2a8d264c7f92c2a477def67