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

Change-Id: Iec7a019c1e00e6f44e217c342de77ce55ba09e42