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

Change-Id: I816c5e4a2e74994d8a8c0b04b24d9bd7946fc6ae