[automerger skipped] Merge "Add minimum bandwidth config for showing LTE+ data icon" am: 9890dd3d4c am: 17035aec92 am: acace31e3b -s ours am: 341a523d26 -s ours

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

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

Change-Id: I4c32630d1e43aec007b6d7ae4e1527e5a641a18f