Merge "Add precise disconnect cause in DisconnectCause" am: 8098078edf
am: e77087994d

Change-Id: I1aae0435aa09faaeae396242fcd01cd6c7480527