Merge \"Require permission for FLAG_WILL_BE_FOREGROUND.\" into nyc-mr1-dev
am: 97639a1310

Change-Id: I90756b855879cf37bc0bca86844fe99f8a62ef25