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

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



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