Bug: 120986348 Bug: 120945804 Test: atest FrameworksTelephonyTests Change-Id: I4d7a203dd57050535867329c8dc36f8c75667c15
d839b0d384
faf8c714b7