am 555f91db: (-s ours) am e62421f1: Merge "Teach Pm about the "always ask" link-handling state" into mnc-dev

* commit '555f91db7cb364714b1f731a85242adc98b868c3':