Merge "Fix empty value problem in the TextEntry" am: ed3e683407 am: 28bf20620e

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

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