Merge "Modify TelephonyHistogram.java functions." into nyc-mr1-dev