Merge "Put all text content in the node's text" into udc-dev am: 5d0e1903...

Merge "Put all text content in the node's text" into udc-dev am: 5d0e1903 am: d5be58a9 am: 8d1f73bc

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



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