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

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