Merge "Update mapping for the rat type in data stall proto" am: e372df0b69

Change-Id: I59f8f78037d6b74f10919e00524f723eb45111df