Merge "Merge "Fix an assertion to avoid crash on deletions in Recent root."...
Merge "Merge "Fix an assertion to avoid crash on deletions in Recent root." into nyc-dev am: 7a91029b am: 66f75538" into nyc-mr1-dev-plus-aosp
am: 989d2e6b
* commit '989d2e6b':
Change-Id: I9830138645ff9ed49b178f02d724b4cc0ae94c6c