Merge "Fix empty value problem in the TextEntry" am: ed3e683407 am: 29522fa52a am: d7f5203dc7

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2273087

Change-Id: I2b91741277c12f91c23c1cfe993d6c72d82a9103
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>