Merge "[MS21] Remove DataUnit dependency" am: 4f4060c7b4 am: f5012d0cb8

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

Change-Id: Ic3808c2bcd576ded8ab10f5d1e10865b1087e4a2