Merge "Merge "Refactoring: Rewrite links in Metalava instead of carrying patches." am: 21558d75 am: 02a8e8c7 am: 7e61c246" into qt-r1-dev-plus-aosp