Merge "HACK: allow apps with pre-release SDK RESTRICT AUTOMERGE" into udc-dev am: 3dbf86ba

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



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