Merge "Add 5G stats to Phone info menu am: 728961046f am: eb992a82a8" into rvc-qpr-dev-plus-aosp