Merge "Consistently use CLOCK_MONOTONIC for timing encryption"
am: f9510e3262

Change-Id: I6eb165b5e9214eb614434ecfa654cfcd22327af1