Merge "Merge "app link handling under restricted mobile data" into oc-dr1-dev am: befdbf0cac am: 9d14909e45" into oc-mr1-dev-plus-aosp
am: 456bce8504

Change-Id: I5e3767d7c1da810d1fa1dd2d95f7892aae3b3780