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: fda50c24
* commit 'fda50c24':
Change-Id: I25a486080d2363add816f76b85aef13997f7d270