Use consistent names in api_surface

While the `api_surface` property on `java_api_library` does not appear
to be used it, along with the `api_surface` property on `droidstubs`
will eventually be passed down to Metalava and will reference an
API surface defined in the `build/soong/java/metalava/main-config.xml`.
That means that the values will need to be consistent.

The `droidstubs` `api_surface` property is set by `java_sdk_library` to
be the name of an `apiScope` which uses `-` as separator not `_`. So,
it is `module-lib` not `module_lib` and `system-server` not
`system_server`. This change fixes the explicitly specified
`api_surface` properties that use `_` instead of `-`.

Bug: 391554590
Test: m checkapi
Change-Id: If23af2717148c3ea15432a1fbce2c06c46c280ce