Merge "Revert "Remove the OEM hook implementation and usage""
am: e7a099149f

Change-Id: Idb6e70da6b33f25d1cdce8ed5ed4b845b6237648