Merge "Fix length of BCD in EF_MSISDN" am: 4e384e6c49 am: 7a3dd3241b am: d8d46e746a am: dccf4d6766

Original change: https://android-review.googlesource.com/c/device/generic/goldfish/+/1607933

Change-Id: Ib474ad24ba1fc8c369df6e62927a79de703f5a9e