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

Change-Id: I98836388ee501bb44c1ed60925d8846dbbe7d4ae