[automerger skipped] Merge "Dump HALs and enable persistent logs for radio...
[automerger skipped] Merge "Dump HALs and enable persistent logs for radio bugreports" am: 49eea1e7 am: 6c1fbfa0
am: abd47fe4 -s ours
am skip reason: change_id I158e327d5c5a13c64e48d5711f82903d4a50b8f0 with SHA1 b4389d9b is in history
Change-Id: Ia316d478a901ad750217e0ec5b02f095f030cc10