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

Change-Id: I464eac73bd06533c8b4d4a6a14dc1be605357439