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

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



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