Merge "Replace the globe+airplane icon with gblobe+x icon" into sc-dev am:...

Merge "Replace the globe+airplane icon with gblobe+x icon" into sc-dev am: 2ca03547 am: 21b43199 am: 3ac5d684

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14720090

Change-Id: I04b1f66a7aa84bac86f45e00142ffa6dafb60894