Merge "Stop ignoring the targetSdkVersion when it includes the API fingerprint...

Merge "Stop ignoring the targetSdkVersion when it includes the API fingerprint SHA" am: 67a7ab89 am: bc7be1ac

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



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