Merge "Delete launched dock setup flags" into tm-qpr-dev am: 7be703bd am: f86fcd72

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20244538



Change-Id: I99638d66a9d2cfcf197e4a06ba76c26a077daab8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>