Merge "Add defineClass variant" into main am: 095fdbcfee am: df7cb5828f

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3283866

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