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

Change-Id: If58cc1911c477ac9bed03fc39952a573db71651e