Merge "Merge "Remove favorites when app is uninstalled" into rvc-dev am: 35886c0d am: 7f381cfa" into rvc-d1-dev-plus-aosp