Merge "Set attributionTag for noteOp(WRITE_SETTINGS) calls" am: da8697a48b am: c5299c7c3a am: e777a902f2

Change-Id: I9ab0540ee40b9466926f9703b42d79c22e0c16ec