am 9a63aa2e: resolved conflicts for merge of 07349e9d to lmp-dev-plus-aosp

* commit '9a63aa2e7e214043a4934856b495b6efae8cad40':
  Change the DateFormatSymbols serialized form