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

Change-Id: I631d2d2ee13278d51c4971f6589faf9138afef3e