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

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



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