Merge "Add maximize button to caption" into udc-qpr-dev am: f0cec4ca am: f6d88ed9

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



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