[automerger skipped] Merge "HACK: allow apps with pre-release SDK RESTRICT...

[automerger skipped] Merge "HACK: allow apps with pre-release SDK RESTRICT AUTOMERGE" into udc-dev am: 3dbf86ba am: 66b21150 -s ours

am skip reason: subject contains skip directive

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



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