[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: 0ccbe274 am: d846117d am: 6d85cac2 -s ours

am skip reason: subject contains skip directive

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



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