Merge "DO NOT MERGE. Add modem logs to the bugreport" into nyc-mr2-dev
am: 2a221ffc01

Change-Id: I45a190ea17a413250c9d9ec9fab0a8e44696be2c