Merge "Fix LogAnalysis App Versions dump. (cherry-picked from unsubmitted change in oc-dev ag/2549006 and updated) am: 3a879098 am: d4dcae82" into oc-mr1-dev-plus-aosp