Merge "Device config for RTT and PhoneAccount capability" am: bdbc6b8b3d
am: feb660957b

Change-Id: I325a32490428073488bae357898a3388416d0086