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
Change-Id: I4dec93291c2f716c1600c141506fa36cb68475db