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

Change-Id: I6f19aacf006fee13f6c64fcef8bed73d23234d9c