[automerger skipped] Merge "Add a documentation in EmergencyNumber#getNumber" am: 27c3d13f9f am: cd9786aae4
am: 86e80ec970 -s ours
am skip reason: change_id I1f6bd74f1d6eb86fe3326246e0ddb08b9cf7ac11 with SHA1 552a58ae51 is in history

Change-Id: Ie3a06da2fd4e597ec944b7416c00761e7c717a85