[automerger skipped] Merge "Add minimum bandwidth config for showing LTE+ data icon" am: 9890dd3d am: 17035aec am: acace31e -s ours

am skip reason: Change-Id I4068860c5798f921fc198c095ba9b8f84ae5663b with SHA-1 ea9d40e1 is in history

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

Change-Id: I18330dc76808da294c6365610c43e5108215e197