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