Merge "Add support for CALL_WAITING supp service notification." am: fc0a5cae29
am: c2390cf0f6

Change-Id: I7216109d142fa2e9ce9f0c0063b8e584950e9186