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

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

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