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

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

Change-Id: I668111442714295543792d471f1d8df2089b7d7b