Merge "Merge "app link handling under restricted mobile data" into oc-dr1-dev...
Merge "Merge "app link handling under restricted mobile data" into oc-dr1-dev am: 93bf6200 am: a40b8b74" into oc-mr1-dev-plus-aosp
am: a6242a18
Change-Id: If8885bbe62dc6197b1fa86d899d1c028280c0db8