Merge "Move EventLogTags.writeDeviceIdle calls outside synchronized block." into nyc-mr1-dev am: b0e4d9e97b am: 4d23729cc9
am: b21bbfd039

Change-Id: Ic72d4bf468ed44b358dcc3e2d86ced2ce1c09390