Merge "[MS21] Remove DataUnit dependency" am: 1fb56a8f11 am: 2bee00d867

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1933092

Change-Id: Ic3808c2bcd576ded8ab10f5d1e10865b1087e4a2
tree: 950535bb8114dc3a3cdb077a5af96f147615a04a
  1. core/
  2. framework/
  3. framework-t/
  4. service-t/
  5. services/
  6. tests/