Merge "Simplify lmkd functionality am: 19e26708c2" into oc-mr1-dev-plus-aosp