[automerger skipped] Revert "HACK: allow apps with pre-release SDK RESTRICT AUTOMERGE" am: ba22ea80 am: 3b2c3257 am: 6c14640a am: f94c4e3d -s ours

am skip reason: subject contains skip directive

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



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