Merge "Merge "Fix an assertion to avoid crash on deletions in Recent root." into nyc-dev am: 7a91029b am: f846d851" into nyc-mr1-dev-plus-aosp