Merge "Remove __ANDROID_API__ #if checks." am: c8efe605ee am: 8a7bc561b6 am: e87c05915d

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3218487f3022c54766d935876b4858c079c3ba11