Merge "Revert "HACK: allow apps with pre-release SDK RESTRICT AUTOMERGE"" into udc-dev am: 9c265765 am: 2ff3f0e9

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



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