Merge "Allow service auto-restarts when its dependency is force-stopped" into...

Merge "Allow service auto-restarts when its dependency is force-stopped" into sc-v2-dev am: df6ae85d

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

Change-Id: Ieb518c1bbf1a270065724104312b3e9abf25d4b7