[automerger skipped] Merge "Revert "HACK: allow apps with pre-release SDK RESTRICT AUTOMERGE"" into udc-dev am: 9c265765 am: 2ff3f0e9 am: b290376f am: 42e1a916 -s ours

am skip reason: subject contains skip directive

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



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