tree 4b8871bfdccd83c0231bbdf51afb6c6f5a9cdfc3
parent 0c299cb324476b46bacbfd090d67ec7674c687aa
parent 0bf000104fb16f4fd0dcbde19300a999398d428f
author Jonathan Miranda <jonmiranda@google.com> 1623887205 +0000
committer Jonathan Miranda <jonmiranda@google.com> 1623887213 +0000

resolve merge conflicts of 0bf000104fb16f4fd0dcbde19300a999398d428f to sc-v2-dev

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