[automerger skipped] Merge "Test static methods are accessible in updated apis" am: 5c3325b09f am: 81c108dd98 -s ours am: 30f7b7aa96 -s ours

am skip reason: Change-Id I7d312e8bf5094a3843ef70f235cd38fb73a99fac with SHA-1 5d8c067a44 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/SdkExtensions/+/1360501

Change-Id: I3cd5633ab7f5d4ae9edd2f269212c692c3bb2c71