tree 43219993408fc8ae955cfced43877d8aaa9b455f
parent c029e27a5341bf1207bfea4de448d9734c04def3
parent 8087607fbce19cd1b46cb07ba0e0ce83b33ef936
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1579634020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1579634020 +0000

Merge "Remove an interface before more invasive changes" am: e4a64b4e6b am: 2260679ecd am: 8087607fbc

Change-Id: Ib8d4de706116b2b86e9fb22b8c3466ff22aac9e5