Merge "Fix issue #29069028 NYC: device boot failure: NPE in AppIdleController" into nyc-dev am: 3e05055af7
am: 6f2181f251

* commit '6f2181f251cd6377ef438f9d9c832caf2d251882':
  Fix issue #29069028 NYC: device boot failure: NPE in AppIdleController

Change-Id: I18cfcd873ae2cdf7b844c6f785edf1eb180d2ec0