Merge changes from topics "cdma_eri_api", "cdma_eri_displaynumber" am:...

Merge changes from topics "cdma_eri_api", "cdma_eri_displaynumber" am: b6d1f47c am: 4319ed36 am: 22575e2c

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1504955

Change-Id: Ie026572b55906384cb6f71c5947180c788eb5f64