[automerger skipped] Merge "Revert "Update CtsShim to use sharedUserId"" into...

[automerger skipped] Merge "Revert "Update CtsShim to use sharedUserId"" into tm-dev am: d4156578 am: f9518d68 am: 58b241e7 am: f95de5d5 am: 68daf653 am: 4ad9b1ed -s ours

am skip reason: Merged-In I958805108bd8e2a90e79ae8f2add6616bc82ad84 with SHA-1 8691411e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25560359



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