Merge branch 'LNX.LA.3.5.2.2_rb1' of git://codeaurora.org/platform/frameworks/opt/telephony into cm-11.0

Change-Id: Iea6b1df02ab59e2f897d589e5b9575546e09dd17