Merge "Keymaster worker threads stick around for 30s"
am: 6d98db4829

Change-Id: If367b05f5b7bbcf3da7d49751a6e043af4224cd7