Merge "Add CallAttributes and PhoneStateListener method" am: 7bc14fcc38
am: 8a6a6a61f8

Change-Id: I019bafc8fc47758f7cdeae0aee1081f73965fc7b