Merge "target_sdk_version replacement should respect REL branches" into...

Merge "target_sdk_version replacement should respect REL branches" into udc-dev am: e792debb am: a841e74d

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/22942821



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