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 am: cc20521b

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



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