Merge "Remove unused deps." into main am: b6c1a01f7d

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

Change-Id: Ibc0491edb2a2c65189de7f05490416f10cc30da1
Signed-off-by: Automerger Merge Worker <[email protected]>