[automerger skipped] Merge "Remove __ANDROID_API__ #if checks." am: 7af525ef...

[automerger skipped] Merge "Remove __ANDROID_API__ #if checks." am: 7af525ef am: fc4d69df am: 202b5ab5 -s ours am: c396fb11 -s ours

am skip reason: Change-Id I94d2ad6fafb6d907793a416db82a9e56f4f61d1c with SHA-1 23e82b47 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3c6cff4f975bb4242c1618dd8cbbb4721f166e00