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

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

Change-Id: I674c1a86fb4c5b0a1cccc9fd2891b3bce459cd91