[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: e189e7ab am: f0671376 am: acc4cd35 -s ours

am skip reason: subject contains skip directive

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



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