am fb861b6c: am 31fb202e: Merge "Frameworks/base: Compile-time optimize SQLiteConnection"

* commit 'fb861b6c8d255fc31f3460e39681a4fee35f156b':
  Frameworks/base: Compile-time optimize SQLiteConnection