Merge "Revert "HACK: allow apps with pre-release SDK RESTRICT AUTOMERGE"" into...

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

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



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