[automerger skipped] Merge "Allow service auto-restarts when its dependency is...

[automerger skipped] Merge "Allow service auto-restarts when its dependency is force-stopped" into sc-v2-dev am: df6ae85d am: c650ef8a -s ours

am skip reason: Merged-In Ieef1fcee01f3009251f5a8e147063665cedaae90 with SHA-1 53ff2501 is already in history

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

Change-Id: I951d61c72051ddfcadb175f03504591497addd91