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

Change-Id: Ic662de15a4cd95a77f509f1aaa56ea3bf6ae4b35