[automerger skipped] Merge "Fix leak due to PhoneConfigurationManager" am:...
[automerger skipped] Merge "Fix leak due to PhoneConfigurationManager" am: 00754008 am: b057a539 -s ours
am skip reason: Change-Id I4cf7dca0b82c743a8132925dce0d3edd63659353 with SHA-1 b20534d9 is in history
Change-Id: I2e955cf66fe6c2993b9743bda0123e40b478bf67