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

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