Merge "Have vold inform keymaster that early boot ended" am: 68b9fb10ae am: fce0d92ce4 am: bf352873ad

Change-Id: I3aaebfcca61c92667de114d477cbbcf35d23bcd9