Merge "Remove __ANDROID_API__ #if checks." am: 1528efe4b1 am: 159155defe

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibb1e8c7f8ba5c99b7f33b65c130f9ec3d0fb6498