Merge "Merge "Fix the issue that App crash on startForeground" into nyc-dev...
Merge "Merge "Fix the issue that App crash on startForeground" into nyc-dev am: 0df1ca8a am: 43347149" into nyc-mr1-dev-plus-aosp
am: 2291d9dd
* commit '2291d9dd':
Change-Id: If53e56656a31c8766aac5191eb4559866aef2dd0