Merge \"Use SystemProperties to cache provisioned status for volte, wfc, vt.\" into...
Amit Mahajan [Fri, 22 Jul 2016 22:36:47 +0000 (22:36 +0000)]
am: d7cd12478f

Change-Id: Ie16022ebfbe6c14eccb11427f27b9df9e3e390ed


Trivial merge