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

Change-Id: I099944752fc3006c1e98750dd46dbebf5e50789f