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: e269d098

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



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