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

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