[automerger skipped] Merge "SdkTestCore for non-updatable modules" into main am: a81ea29d7f am: cd6e15682f -s ours

am skip reason: Merged-In I855346c01bb609e81b14dbdc13330315badc339e with SHA-1 e35b138481 is already in history

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

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