Merge "OPP: Handle URI Security Exception on OPP Transfer"
am: 73450ac80b

Change-Id: Ie5129af19ac790185b7cd6cb59f952244d40832b