Merge "Hide and disable emergency assist API" into mnc-dev