tree cb18709f85d0d9e9b746e44e3d48694901e552f9
parent d9d8fd2b2fdc66e0174f7cdc5769523441ad375a
parent 5920da095aab387fe20730a30b712c5ffd39f94b
author android-build-prod (mdb) <android-build-team-robot@google.com> 1567541344 +0000
committer android-build-prod (mdb) <android-build-team-robot@google.com> 1567541344 +0000

Merge cherrypicks of [1113272] into androidx-room-release

Change-Id: I205e46478c5fa3df0092294a2db349d9e09b2ed9