Merge "Un-deprecate SmsManager APIs" into rvc-dev am: 85e31403 am: 0c93d999 am: a7276af0 am: d617a47a Change-Id: I19e43ed7e1e03fa212639235f7bf22eff34b0190