Merge "Clean up half sheet code" into tm-dev am: d42fbb9f38

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Nearby/+/16943572

Change-Id: I1e2c31f0ede94d93d3b0e9f14b35b23ba8dfee1d