Merge "Fixing DatabaseUtils to detect malformed UTF-16 strings" into rvc-dev...

Merge "Fixing DatabaseUtils to detect malformed UTF-16 strings" into rvc-dev am: 0dcc5c6e am: 799e127b am: ddc2eb9d am: 16658a14 am: 2b3e7ada am: ceacb727

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



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