Merge "Fixing DatabaseUtils to detect malformed UTF-16 strings" into udc-dev am: 24cc154421

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

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