[automerger skipped] Merge changes from topic "phone_info_5g" am: 20c0cd6b...

[automerger skipped] Merge changes from topic "phone_info_5g" am: 20c0cd6b am: 0cb19b5e am: 8683d3da -s ours am: f0dd0867 -s ours am: f55ba6d6 -s ours

am skip reason: Change-Id Ie709cad1c94ad204c46a559d316f45da16c3541c with SHA-1 33e5841e is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1371137

Change-Id: I5c305a30ff6bbc5b2b3426d1ff647f9cdd61c138