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

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

Change-Id: I2648fa6514d44dc7122c0fd4a8df11eab4926794