This mostly reverts commit 692309090d and updates the icon. Bug: T224216 Change-Id: I7200aaef5a15479afb4bc99f5195e900351a055a
692309090d