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

[automerger skipped] Merge "HACK: allow apps with pre-release SDK RESTRICT AUTOMERGE" into tm-dev am: 0e158d04 am: a9b02dc3 -s ours

am skip reason: subject contains skip directive

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



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