Merge "Merge "Fix issue #29069028 NYC: device boot failure: NPE in AppIdleController" into nyc-dev am: 3e05055af7 am: 0acb155338" into nyc-mr1-dev-plus-aosp
am: 2726da7c96

* commit '2726da7c96df40b7eef9151391b4f5a43b1d01b7':
  Fix issue #29069028 NYC: device boot failure: NPE in AppIdleController

Change-Id: Ic4bff1a6e8f2fc0a41904e5da3c786b569079787