[automerger skipped] Merge changes from topics "cdma_eri_api",...

[automerger skipped] Merge changes from topics "cdma_eri_api", "cdma_eri_displaynumber" am: b6d1f47c am: 4319ed36 am: 22575e2c am: a9224e55 -s ours

am skip reason: Change-Id I256649ad0ddcada29e4a7012de3e5889348adb17 with SHA-1 73157571 is in history

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

Change-Id: Ib92543d28cd776ed56a3310b650fda48e379b60d