[automerger skipped] Merge "Add maxTargetSdk restriction to unused APIs." am:...

[automerger skipped] Merge "Add maxTargetSdk restriction to unused APIs." am: f8abe13db4 am: eb80316624 am: 5c7c5253 -s ours am: 9448a35d -s ours

am skip reason: Change-Id I626caf7c1fe46c5ab1f39c2895b42a34319f771a with SHA-1 74b0ebeb is in history

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

Change-Id: Ie7a69520ba03c3454455d1fe0d0daf95d12840ed