Merge "Fixing DatabaseUtils to detect malformed UTF-16 strings" into rvc-dev am: 0dcc5c6eb5 am: 799e127b0b am: ddc2eb9d24 am: 16658a145e am: 2b3e7ada29 am: ceacb727a4 am: 758bdf12a6 am: 0ba161ace6 am: 12db2bc404 am: 257af40b69 am: 68312ca588 am: 1bb79acacb

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

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