Fix inability to remove or interact with folder when removing 2nd item from folder

Fix: 289960317
Test: Verify in unfolded felix that going from 2 icon folder and dragging 2nd icon out of folder lets you open the app that remains where the folder was
Test: Verify in unfolded felix that going from 2 icon folder and dragging 2nd icon into remove droptarget removes the folder and turns it into a single clickable icon
flag: no flag
(cherry picked from commit 5a7ea3069b984aef151fc2486319583c769cf12c)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:326ec97ab6a4d348708830cd2860d4dd90a59039)
Merged-In: I26138ee9f8e7cdb45cafe2446dc4d1e3d6d8347f
Change-Id: I26138ee9f8e7cdb45cafe2446dc4d1e3d6d8347f
2 files changed