Merge branch 'pie-gsi' of https://android.googlesource.com/platform//packages/services/Telecomm into HEAD

Change-Id: I6954e73ba9e505484e5d88248e04f10df1261a5a