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

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

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



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