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

Merge "Crash when enabling show_operator_name_in_statusbar_bool" am: 247d2b12 am: a4dc4b47 am: 4181f26c

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



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