Roll forward of https://googleplex-android-review.git.corp.google.com/#/c/367504...
[android/platform/packages/apps/Phone.git] /