Merge mainline-release 6664920 to master - DO NOT MERGE am: 3ccf02284e

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

Change-Id: If9fe75b82e026d42a086142d028dfd7075aa4c39