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

Change-Id: Ic9c9c931601444c0a40552912253cd1569fe19df