Merge "Fix testTimeTrackingAPI_ChainedActivityExit test" into nougat-cts-dev am: 214c136d02 am: d4ccd06017
am: 069655d2a4

Change-Id: Id415dc1f47a66786b6399dcab0d6636af99ae1a4