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

Change-Id: Ib1e49dbebe05e92dd1efd5886ab0307165eeff9e