Merge "Fix JobServiceContext leak issue" into main am: 6b185621da am: 9a946fcfaa am: 030eb7a501 am: e20db188b2

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

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