[automerger skipped] Merge "Add Dynamic tiles for Settings" am: b576e24d73 am: af4605f4d6
am: ae71ccdda9 -s ours
am skip reason: change_id I042d39bfde0875cb4f88b4994ac1e9856e7e6a0a with SHA1 0390f63bd4 is in history

Change-Id: I5140c1824a4b5d795f82fc15d3be8a922d21f499