Merge "Merge "Remove pre-N db after successful migration" into nyc-dev am: cdb5fcf7b8 am: d0a55f2ecb" into nyc-mr1-dev-plus-aosp
am: c394e5fee1

* commit 'c394e5fee1e786b1da4493f12c088bb52a2a388f':

Change-Id: I59239fbe14beba7b9e7e4bbe8c42981c8ba513e3