Merge "Refactor Ringtone.playFallbackRingtone" am: 2f56b3ab02 am: cbba151c10 am: 010e3ddc5f

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1931765

Change-Id: I4d17fdf6a29cc66fce523c227f82a19366ca5636