Merge "AlertDialog metrics and measurement fixes" into lmp-mr1-dev