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

* commit '0acb155338f8eec7f15069e5133519a6ad31a00f':
  Fix issue #29069028 NYC: device boot failure: NPE in AppIdleController

Change-Id: I74edc775e4fce077a7d4a933d6c025b9398db5fb