Merge "Merge "Fix issue #29069028 NYC: device boot failure: NPE in AppIdleController" into nyc-dev am: 3e05055af7 am: 6f2181f251" into nyc-mr1-dev-plus-aosp
am: fd2cbd6282
* commit 'fd2cbd6282be5b141a9f1c44b0650521d12858d7':
Change-Id: I56989b002820ad7c308912c812b6e8747340d5ce
This commit is contained in: