Merge "Deprecate some system apis in TelephonyManager"
am: cec2e41d43

Change-Id: Icce3d305bf6a92660eac785f0088788fea1ddb77