Merge "Emergency dialer bottom margins" into oc-dr1-dev am: 7bbf764829
am: 3684d082b9

Change-Id: I35a3c94f82343cbc37627917327cb0bb6b3176b7