Merge "Revert "Clear statement cache if schema changes."" into udc-dev am:...

Merge "Revert "Clear statement cache if schema changes."" into udc-dev am: 5003af01 am: fa609780

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



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