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

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