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

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

Change-Id: I18f7b2d6f60e6757715ca2ba103d1cc87ed0d42a