[automerger skipped] Update Settings overlayed icons. am: c477507f4e
am:3e484def2f
-s ours am skip reason: change_id Ib548c0b47db0064bcb1536c9b7a650912f28273f with SHA15d8b1b3cc5
is in history Change-Id: Iffe2795c97b0a9a769eef2d8cf311e7dd87080eb
This commit is contained in: