Substitue values in SQL returned for display

Shows quoted values instead of '?' placeholders in sqlQuery returned
for display.  Note: output of this fn is not to be sent to database
under any circumstances!

Change-Id: I5642061184eaaca042fd6ab62075b6d0da75164c
Merge "Substitue values in SQL returned for display"