Merge "Remove non-existing dependency" am: 1db78504aa am: 2859fabd5e

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

Change-Id: Ife48bc85af5b144dc5b507fdb91963f963d4e8c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>