[automerger skipped] DO NOT MERGE - Use TimingsTraceLog on...
[automerger skipped] DO NOT MERGE - Use TimingsTraceLog on SystemServiceManager and VoiceInteractionManagerService. am: ed30689e am: 88904f9c -s ours
am skip reason: subject contains skip directive
Change-Id: Ife0122ba6d6f474513685b60f22caee4190e45ce