tree ce57aa3e47229d49e1e1e074c7539bfd227133b3
parent d00e7d7ce550966c03ed544464d0456f030f4094
parent 3798b435ed58facacb16e79120f3d37da1bb9bbf
author Nazanin Bakhshi <nazaninb@google.com> 1603354893 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1603354893 +0000

[automerger skipped] Merge "initialized carrier_certificate_string_array to an empty array instead of null, so that when a certificate is removed, it is also removed in SubscriptionInfoUpdater#updateSubscriptionByCarrierConfig" am: 12231e3a46 am: fc5c95c7db am: 1218bbd843 am: 3798b435ed -s ours

am skip reason: Change-Id I921007498f42119581f565fcc6625c1275c59df8 with SHA-1 d18cde663e is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1469714

Change-Id: I58dcfb026ada4a4fa2b4359eb349a3d357de23fd