Merge "Keep metadata and buttons in the same position" into tm-qpr-dev am: 71d3dbf2

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



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