Merge "Don't cache suspend_control service" am: 1371e73894

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

Change-Id: I83bcaf82bd7a53f97112daf043c75601c99ffa34