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

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

Change-Id: Id2dc31956664b5db13a724babd5997ddcb2aefa9