Merge \"Merge \\\"Make Activity.getReferrer tolerate custom Parcelables in intents\\\" into nyc-dev am: 7a37f8945f am: fb310f6a2f\" into nyc-mr1-dev-plus-aosp
am: 83bbb161fa

Change-Id: Ifecc6a0910a14ff4c71719bc6e7c2db8638d5acf