Merge "Update protected void stopNetStatPoll()" am: 7fbd86525f am: 3870d00f8c am: 4e2c93ff2a

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2014816

Change-Id: I57c56a1160a7d40ef27a5e480831b2d82d0011bd