[automerger skipped] Merge "Dump HALs and enable persistent logs for radio bugreports" am: 49eea1e7c9 am: 6c1fbfa043 am: abd47fe4c0 -s ours
am: 9b9e099b93 -s ours
am skip reason: change_id I158e327d5c5a13c64e48d5711f82903d4a50b8f0 with SHA1 b4389d9b48 is in history

Change-Id: I916237ce649d5df0cfd190c8508e4ef7e0cb7477