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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If18e34c61e873c66f5cb166d8a1ae2a75d00b3f4