Merge "DO NOT MERGE: Accurately emulate historic Downloads ACTION_VIEW behavior." into nyc-mr1-dev am: 466d359330 am: 89ff02cd14
am: 960aadc0b1  -s ours

Change-Id: If7cb80c882f12d2a4c731f1c23b5021746940f3a