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

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

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



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