Merge "Make get/setCallerNumberVerificationStatus final." am: 4cbb288657 am: 329d286b88

Change-Id: I2120367071a694f93c61e6c0df9945404f012373