Merge "Merge "Fix package name and version code of ctsshim CtsShimTargetPSdk"...
Merge "Merge "Fix package name and version code of ctsshim CtsShimTargetPSdk" into rvc-dev am: 1dbe4dfa am: 594fdd86" into rvc-d1-dev-plus-aosp am: 9593c5de am: 7e32f3a7
Change-Id: I99b1e8d2211805cc43384bcb6feb7cc16ce7fdbc