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: 8f040ef1 am: 8e9adcbe

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



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