Merge "Fix close and back buttons in caption proto 1." into tm-qpr-dev am:...

Merge "Fix close and back buttons in caption proto 1." into tm-qpr-dev am: 16ac8f21 am: 54639353

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



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