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

Change-Id: Ic113eea7d3282084f1eae308ae1b6df931bd7a8c