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

* commit '3e05055af775f9539d832b1191ae2ee9bc4acf21':
  Fix issue #29069028 NYC: device boot failure: NPE in AppIdleController

Change-Id: I724497be1fca40530f4c7841cf1f5392b582ca4f