Merge "Add retry mechanism to AudioRecord::restoreRecord_l()." into pi-dev am: 9d7ffe4f7e
am: d46187d29a

Change-Id: Ibcc85193637738f7166b9d393cae8e38b2b39f0c