Merge "Stop #define'ing __ANDROID_API__." am: 94be650e36 am: 73a4ac7daf am: 677f8c48f4

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1580211

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I66d850d16d5ff7c480cb5f8506801660dbb84b3f