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

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

Change-Id: I7ffd281376232b4ca71699dbc3f0f0d9c8367599