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

Change-Id: I3cb646b40746b06de19d7c50504a8699b2081fdc