Merge "Mark deleteMessageFromIcc() as @UnsupportedAppUsage." am: b65bb17129 am: b5606c822c

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

Change-Id: I29d0f1790dc4d71cb3c8cb9dc74a68225c43c44f