[automerger skipped] Merge "update getStaticPhoneCapability to use HAL instead...
[automerger skipped] Merge "update getStaticPhoneCapability to use HAL instead of default value" am: 9e3cfb8b am: 4b7d3cc4
am: 4412ef93 -s ours
am skip reason: change_id Iec4461f2c98afdbc876b196efb5f8132bcbef0c9 with SHA1 af57040b is in history
Change-Id: Icc8e611b28a8677ed731872fe202eebbc377fc5e