[automerger skipped] Merge "Mark deleteMessageFromIcc() as @UnsupportedAppUsage." am: b65bb17129 am: b5606c822c am: cb50c3f61c -s ours
am skip reason: Change-Id Ia7d200bfd4d4565971701048b1c469a6633edeb4 with SHA-1 1530a593ea is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1485139
Change-Id: I305fdf7b8dee685985359bfaf3a38f9434173ed9
This commit is contained in: