tree f4668908157435a6b6c05244de49119dfe471fc4
parent 7dcbddcf21d69a6af1503309d5e30f0c0f657f40
parent db9066a2339cdda9c2899a155c57218ce90688ab
author Xiangyu/Malcolm Chen <refuhoo@google.com> 1550635684 -0800
committer android-build-merger <android-build-merger@google.com> 1550635684 -0800

[automerger skipped] Merge "Move getPhoneCount implementation back to TelephonyManager." am: 72cc8f616e am: ce573a31ff
am: db9066a233 -s ours
am skip reason: change_id Ie13f6222caa1b23b0a537edc014cccd143194b38 with SHA1 e938038361 is in history

Change-Id: I52eb7a66a114b96c9305aaff1ea18c1524f1c625