Merge "DO NOT MERGE Fix migration for default browser. am: 97c75f44 am: 40792006" into qt-qpr1-dev-plus-aosp