Merge "Make sure to stop EJs when quota is finished." into tm-dev am: c3e62a40

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



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