[automerger skipped] Merge "Allow apps with pre-release SDK in REL configuration." into main am: bc42a58f4b am: e7cc4456e4 -s ours am: a4526346e9 -s ours

am skip reason: skipped by user alexbuy

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

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