Merge "Added fail-retry scheme for SMS memory status reporting" am: d371b7ba am: 46da9c93

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1556208



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