[automerger skipped] Merge "SdkTestCore for non-updatable modules" into main am: a81ea29d7f am: 316dbb7cbb am: 47cb6ce1ad -s ours

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

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

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