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

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

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