Merge "Time for SEO in <android/api-level.h>." am: 76210fba9e am: 98665f2190

Original change: https://android-review.googlesource.com/c/platform/bionic/+/2506958

Change-Id: I9fff7e5648bc6613de97042371951731946392eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>