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

Change-Id: Icee758da41debc3a3639de9b47a8889a5b91d6a9