[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 3ccf02284e am: 165b7dc961 -s ours am: 9cc303afd0 -s ours am: f72157d92d -s ours am: f03464acb1 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I7b678a0547d3d1b4660fda6423526ef1141d7278