Merge commit 'bf831e0de0fd1636a7ee2670faed208f96f23f65' * commit 'bf831e0de0fd1636a7ee2670faed208f96f23f65': Fix issue 2306779: Runtime restart - Init failed at android.media.ToneGenerator.
Merge commit 'bf831e0de0fd1636a7ee2670faed208f96f23f65' * commit 'bf831e0de0fd1636a7ee2670faed208f96f23f65': Fix issue 2306779: Runtime restart - Init failed at android.media.ToneGenerator.