Fix -eng build, and fix code formatting.

-eng builds are failing with "You have tried to change the API from
what has been previously approved."  @hide the SHOW_PLMN_LS, etc.
settings from javadoc to shut it up.

The code indentation on this was screwed up; someone is editing with a
broken tab configuration.

Clean up comments.