Merge "Upgrading the targeted_sdk_version for cts app." into tm-dev am: f95cad82ef am: d8afb3d0d6

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/17897465

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