Merge "Allow apps to provide the Instant App installer extra information" into oc-dev am: a9d0e6b205
am: f4488dabd5

Change-Id: I6310b54fc3f5e11feb926fe904d33c4cf67db669