[automerger skipped] Merge "Make GameManagerService JNI registration lazy"...

[automerger skipped] Merge "Make GameManagerService JNI registration lazy" into main am: dc67a341 -s ours am: 5be2ded7 -s ours

am skip reason: Merged-In Idee4cbd973e7c09d435273f927bd787fc2afd0d6 with SHA-1 9a7928b7 is already in history

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



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