[automerger skipped] Revert "HACK: allow apps with pre-release SDK RESTRICT...

[automerger skipped] Revert "HACK: allow apps with pre-release SDK RESTRICT AUTOMERGE" am: 6f525083 am: d23bef72 am: 36f7073b am: 699eac59 -s ours

am skip reason: subject contains skip directive

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



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