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

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

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



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