Merge "API fix: getProprietaryCallExtras should not return null" into rvc-dev am: e5e8e34c am: 74d78443 am: fa01d38f Change-Id: I05070e2e5c4d6eb2cd7f543cff7ae816d9210351