Merge "Fix a bug in maximize buttons in legacy captions" into tm-qpr-dev am: 8aaccc88

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



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