[automerger skipped] Merge "Revert "HACK: allow apps with pre-release SDK RESTRICT AUTOMERGE"" into udc-dev am: 9c265765 am: 8f552273 am: 9aceecb6 am: 6fd8819a -s ours

am skip reason: subject contains skip directive

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



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