Do verify_uses_libraries check for APKs after patching library names.

Some of the `uses_libs`/`optional_uses_libs` libraries may have a
library name that is different from the module name. In that case it is
necessary to patch these properties after `provides_uses_lib` for the
library is applied.

Bug: 132357300
Test: m nothing
Change-Id: I2e2248053787557f955a6b363c22e3bad0301ec7
diff --git a/java/app_test.go b/java/app_test.go
index de06c29..cb19488 100644
--- a/java/app_test.go
+++ b/java/app_test.go
@@ -2335,9 +2335,7 @@
 
 	// Test that all libraries are verified for an APK (library order matters).
 	verifyApkCmd := prebuilt.Rule("verify_uses_libraries").RuleParams.Command
-	// TODO(b/132357300): "non-sdk-lib" should not be here
-	// TODO(b/132357300): "com.non.sdk.lib" should be here
-	verifyApkReqLibs := `uses_library_names="foo non-sdk-lib android.test.runner"`
+	verifyApkReqLibs := `uses_library_names="foo com.non.sdk.lib android.test.runner"`
 	verifyApkOptLibs := `optional_uses_library_names="bar baz"`
 	if !strings.Contains(verifyApkCmd, verifyApkReqLibs) {
 		t.Errorf("wanted %q in %q", verifyApkReqLibs, verifyApkCmd)