Merge "Merge "Crash when enabling show_operator_name_in_statusbar_bool" am:...

Merge "Merge "Crash when enabling show_operator_name_in_statusbar_bool" am: 247d2b12 am: a4dc4b47 am: 4181f26c" into udc-dev-plus-aosp am: 6c466640

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



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