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

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

Change-Id: I60222cb1879651cf283e385519b5c4d156ab68a1