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 am: efad4b6c am: 0bd33b59 am: ab409e71 am: 3252ea9d

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



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