Merge "Fix bug while writing data to parcel in TelephonyHistogram.java" into nyc-mr1-dev