[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: dfc8f323 -s ours

am skip reason: subject contains skip directive

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



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