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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7be64cbfab5f94e6bf4f5272d42be24844725fd0