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: a3bae479 am: c699342b

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

Change-Id: Ie287ee6604b1df4a89917ca1017206136fc60e6c