Merge "Fixing DatabaseUtils to detect malformed UTF-16 strings" into rvc-dev am: 0dcc5c6eb5

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

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