Merge "Adds default keymaster service to the early_hal class" into oc-dev am: 8080d70564
am: b54f809402

Change-Id: I35611fbe914ace129146639900bf531637c1914e