Merge "Add non platform services to telephony bugreport" into pi-dev am: 996fe51a15
am: ef11b3a7bc

Change-Id: I6babc033058b13e54727a8cfaad0a6bddd56fb81