Merge "Stop #define'ing __ANDROID_API__." am: 94be650e36

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7b7d975ce1ef91d515c1b1045f1fe6df6f31fbeb