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

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



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