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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I058908ffe0edd8daad3673fc6461c969ab53780c