Merge "Fix issue #63971747: Audio is not heard first time when played after a long pause" into oc-mr1-dev am: d9d208a6d4
am: 40f21b724a

Change-Id: Idc70234eceb5dcfb95399588ddb5cc8012a09b31