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