Merge "Remove DX from the SDK" am: a5b6f93ff2 am: a2c173be97 am: 0b05fe7f8f

Original change: https://android-review.googlesource.com/c/platform/development/+/1681270

Change-Id: I3d0b57e94b7c88dca24be52a94cd8c0ba93a0243