tree c343cb9f7881650f1010d5254439c4c3305e9de6
parent 8c36fd1057a0a038d70da762351957139e153d17
parent 719a6bd03d0c5ec30a67f3dd606f92f01b256c3b
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1582752456 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1582752456 +0000

Merge changes from topics "remove_oem_configstore", "rename_oem_migration" into rvc-dev am: 256b44d61d am: 296c23fa47 am: 7287a09dfb am: 719a6bd03d

Change-Id: Ia3bf44f099b7c9b68b4aea5b7b364a9f94805be7