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

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

Change-Id: I3cd64a03cc508e4894a174155e27e3137b10ee6f