Merge "API fix: getProprietaryCallExtras should not return null" into rvc-dev am: e5e8e34c am: e1a8122c Change-Id: I9020e7eba161bf1962c493ce3ed619ef0841046a