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

* commit '46ac9a16666ae282d7dde1decb1e45d77eaac652':
  Apply default link-handling policy at OTA from pre-M