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