Merge "Use underscores in package name as test dependency." into main am: 352ce21f75

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

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