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