[automerger skipped] Merge "qcom/audio/hal: add offset to MMAP output time" into pi-dev
am: 3d10162f -s ours
am skip reason: change_id I7bc9924a7aaa34d2e721365aa8ee0b69de5936f8 with SHA1 28c35e5c is in history
Change-Id: I196cd07e23dc5473d3c73ef385aa961e7075b4cd