Merge "Switch ringtone looping to use MediaPlayer looping." am: c1a4dd791b am: 5585a9f872

Change-Id: I0cff8ee0c6e5c325c395a0cb2ff58344201dfc2f