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

Change-Id: I3ddd8954cf8443f549f7965cc43f2600bf92a80b