Merge "Merge "Update TelMan API for testing Line1NumberForDisplay." am: d09bd9d9f6 am: bd95271170" into qt-dev-plus-aosp
am: 76d3c3d05e
Change-Id: Ib9905e738293b22117101cfff08904886864388b
This commit is contained in: