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

Change-Id: I1b777360e88560441da35e7a0527b10638ec99d1