Merge changes from topic "am-e90d0d50cdd34695a4d19e0f9412f330"
* changes:
[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
[automerger skipped] DO NOT MERGE - Use TimingsTraceLog on SystemServiceManager and VoiceInteractionManagerService. am: ed30689e21 am: 88904f9cf3 -s ours am skip reason: subject contains skip directive