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

Change-Id: Id9063cf44028d08f44fcf3ec2a397cf6286d4d7a