Merge "Merge "DO NOT MERGE Fix migration for default browser." into qt-r1-dev am: 85773ee58c am: 09a909b080" into qt-qpr1-dev-plus-aosp