[automerger skipped] Merge "Move CtsShim and CtsPrivShim APKs out of system." am: 20d1b7d966 am: 6b0308921b am: 3b9b4ffc95 -s ours
am skip reason: Change-Id I03939f6c3e711d5887da201e32173f86a6b0289e with SHA-1 3e41a7f856 is in history

Change-Id: Ia9418360f4b4bd94fbd53530dac86471f6f13ef2