tree 87c56f266fa35e625ad34146f24c542440087bf1
parent 6e342b063386e2260e31b6ee9ceb660aba9b8e36
parent fdd4cb3c390bb84d2ab2a1562812231610913a7f
author Jonathan Miranda <jonmiranda@google.com> 1623888479 +0000
committer Jonathan Miranda <jonmiranda@google.com> 1623942341 +0000

resolve merge conflicts of fdd4cb3c390bb84d2ab2a1562812231610913a7f to sc-v2-dev-plus-aosp

Bug: 191306539
Bug: 175329686
Change-Id: Idadb4654fb832652f9671c6e81bbc58e13016cc4
Test: create folder / add items to folder
Merged-In: I48e3f6a20c27c8c7aeef5da7a464a6c4a5e4180c