Merge "Disable certain mobile settings during phone call." am: e91a3a3f77
am: 952819079f

Change-Id: I5a55eb3d637d96cd6fc9fe059ec8983215760f20