[automerger skipped] Merge "move and rename DcFailCause to DataFailCause" am: d2a163ad38 am: 49ebf0dfed
am: f04d5a27d4  -s ours

Change-Id: I61be93082fd0603f28e043c5221ae08b5bb165cc