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

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



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