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

Change-Id: I1b1e09395c7db6e9f6364962b52c4425f09b89a3