am 623def69: am 7bae31f8: am 60aae166: Apply default link-handling policy at OTA from pre-M

* commit '623def69ef11f95973d93e6dbc2624e814a3adf3':
  Apply default link-handling policy at OTA from pre-M