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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6baddda3f36366349a7c67f13a043adeb83a089e