Merge "ES improvements for SlicePurchaseController" into udc-qpr-dev am: a463512785 am: 8968011cb7

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telephony/+/23336776

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