am b9116af2: Fix SubtypeLocaleUtils.getSubtypeNameForLogging accepting null

* commit 'b9116af29f971137e7bd6754c5d74d35aeeed05b':
  Fix SubtypeLocaleUtils.getSubtypeNameForLogging accepting null