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