[automerger skipped] Merge "Add a carrier config to disable ping test" into...
[automerger skipped] Merge "Add a carrier config to disable ping test" into qt-qpr1-dev am: ffdedd2d
am: d6b2117f -s ours
am skip reason: change_id I56835e5b416685fbcf2ab2729aa6a039c7f11806 with SHA1 75c0960a is in history
Change-Id: Ie5435b529bffff79cce84b78ddc59b4e1b628af7