Merge "Remove old caption bar before adding a new one" into tm-qpr-dev am: c3322a82

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



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