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