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

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

Change-Id: I18605eee1565df6476ea53990eaecf726335c6c0