Merge "Don't cache suspend_control service" am: 1371e73894 am: da3a84e731 am: cc42fcbbc8 am: afe17a7045 am: 54b17ddbe6

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

Change-Id: I361e4477463384ed2567a07645269ff7212091cb