[automerger skipped] Revert "Remove the OEM hook implementation and usage" am: e12f875cc9  -s ours
am: 2eda1d2745  -s ours

Change-Id: Idade333e174138e2989fb412c92b42a58f5aa4ec