[automerger skipped] Merge "DO NOT MERGE - Use TimingsTraceLog on SystemServiceManager and VoiceInteractionManagerService." into qt-qpr1-dev am: bace1cd5a4 am: fcc25eb58f -s ours
am skip reason: subject contains skip directive

Change-Id: I75e53dccc34d2ff4d47970b0cd4b0a6473abcd07