Merge \"Merge \\\"Recents: Make sure blacklist checks the package name as well as activity name\\\" into nyc-dev am: 10b2fee05f am: 8a17a77e4b\" into nyc-mr1-dev-plus-aosp
am: ec73d5506d

Change-Id: I3e5455ee8f5a3b1f19d361196f606893d6b758ef