[automerger skipped] Merge "Update mapping for the rat type in data stall proto" am: e372df0b69 am: 413ad92be9 am: 0488260bd6 -s ours
am skip reason: Change-Id I12fb14a9b7e70d57ce043bfe2880b358eecea872 with SHA-1 b15c099a80 is in history

Change-Id: Ic7202ac4a34a8507942f90fe41cebcf577b8055e