[automerger skipped] Merge "API fix: getProprietaryCallExtras should not...
[automerger skipped] Merge "API fix: getProprietaryCallExtras should not return null" am: 2a15872d am: 5e7477c0 -s ours am: 6bcb2139 -s ours
am skip reason: Change-Id I7bd0d44f08169d41396a8cb202f3928e14bc5939 with SHA-1 816fdbb2 is in history
Change-Id: I714ab175b495e9eb7177991c88e3dcb6c77e0e7d