Merge "Clean up the JetPlayer class definition" into main am: 8c7e75ebc9

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

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