[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: 5475ff57 am: 275ff3c9 am: 2b6b0c35 -s ours

am skip reason: subject contains skip directive

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



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