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

Change-Id: I48b7e60777641556cb47761022f27f61e0976986