Merge "Fix bugs regarding ShortCodeTest that fails without "112" in ECC List. ( for L )" into lollipop-cts-dev
am: faf3d546d2

* commit 'faf3d546d2a359468fcea2548cbefadf2bce84b8':
  Fix bugs regarding ShortCodeTest that fails without "112" in ECC List. ( for L )