am 63c6a309: Merge "Add dock icon for top-level settings. #2367275" into eclair

Merge commit '63c6a30908a14cdc8cccee3f6a3e88275dcec30e' into eclair-plus-aosp

* commit '63c6a30908a14cdc8cccee3f6a3e88275dcec30e':
  Add dock icon for top-level settings. #2367275