Merge "app link handling under restricted mobile data" into oc-dr1-dev am: befdbf0cac
am: 9d14909e45

Change-Id: Iccd83b5dc4b31d5aac0279e947110dd31e645533