Merge "Retire the Tron metrics reporting for non-A/B update" am: 6bdacc40ef am: fed0b90045

Change-Id: I50402237f4ef3ca99caa27bd474d1a2e7432a42f