Merge "Ringtone picker to handle RESULT_CANCELED from Add ringtone" into main am: 3bd28b5829 am: ca6f28e8f4

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

Change-Id: I4fb09f269376af348b2798dce42d06d3b6e07f49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>