Merge "Use the same name for PipContentOverlay variants" into tm-qpr-dev am: 98b21ffca9 am: 5bb1585337

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

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