Merge "Remove __ANDROID_API__ #if checks." am: b2456d60df

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1578563

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I99e14566e503a0e8e93e1c29bcc2bf1afdea58a6