Merge "Fix incorrect package name in test manifest" into udc-dev am: 42005c3c

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



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