Merge "Update min_sdk_version used in testNoUpdatableJarsInBootImage" am: 3d1b6964 am: 81a96777

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



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