[automerger skipped] Revert "HACK: allow apps with pre-release SDK RESTRICT AUTOMERGE" am: ba22ea80 am: 3edce1bc am: c8ca9564 am: b46a143d -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23640305



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