Merge \"Recents: Make sure blacklist checks the package name as well as activity name\" into nyc-dev
am: 10b2fee05f

Change-Id: I8b7783bbe4924437494f0ed5857ee81f574fe8b1