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

Change-Id: Ia709f60df79664dfcab31bd58c70f2f2f8f643e9