Merge "Remove __ANDROID_API__ #if checks." am: 7af525ef95 am: fc4d69df17

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I130b2513bd243d9d4866a73b2d7e74b1221931fc