Merge "Add hold support to frameworks/base/telecomm" into master-nova