Fix build with java 7

Change-Id: I48b2048a0cc82df0007ca897aaa8e369bf2d8723
am: Fix the privacy guard notification

 * The privacy guard notification was not showing everytime. Fix the
   logic and handle it in the right place so it hits both the create and
   resume startup path.

Change-Id: I80c88ffb0fcb4ed3ea64ceb228bb436975278ecc