Merge "Merge "Fix first notification of each app is not shown" into nyc-dev...
Merge "Merge "Fix first notification of each app is not shown" into nyc-dev am: c178f519 am: f03a50c4" into nyc-mr1-dev-plus-aosp
am: f3ad723c
* commit 'f3ad723c':
Change-Id: I37152c6de945de26ffc1829218aff1d617ea0007