Merge changes from topic "phone_info_5g" am: 20c0cd6b4c am: 0cb19b5ea5

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

Change-Id: Ib6de67754f15b6fc1d54386a0552fadb7b8a778c