Merge "Merge "Always kill app when M_E_S is denied" into rvc-dev am: d7e1e4681e am: e2829e983c" into rvc-d1-dev-plus-aosp