Merge "Fix use of deprecated SoundPool API in Keyguard"