Merge "TelephonyManager.setLine1NumberForDisplay should return a boolean." into lmp-mr1-dev